Skip to content

Commit c97f05c

Browse files
committed
compiletest: Print process output info with less whitespace
Before: ``` error: jsondocck failed! status: exit status: 1 command: "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait" "--template" "/data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" stdout: ------------------------------------------ ------------------------------------------ stderr: ------------------------------------------ Invalid command: Tried to use the previous path in the first command on line 10 Error: "Jsondocck failed for /data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" ------------------------------------------ Rustdoc Output: status: exit status: 0 command: "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait/auxiliary" "-o" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait" "--deny" "warnings" "/data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" "--output-format" "json" "-Zunstable-options" stdout: ------------------------------------------ ------------------------------------------ stderr: ------------------------------------------ ------------------------------------------ ``` After: ``` error: jsondocck failed! status: exit status: 1 command: "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage0-tools-bin/jsondocck" "--doc-dir" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait" "--template" "/data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" stdout: none --- stderr ------------------------------- Invalid command: Tried to use the previous path in the first command on line 10 Error: "Jsondocck failed for /data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" ------------------------------------------ Rustdoc Output: status: exit status: 0 command: "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" "-L" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-L" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait/auxiliary" "-o" "/data/ne321/rust/build/x86_64-unknown-linux-gnu/test/rustdoc-json/traits/supertrait" "--deny" "warnings" "/data/ne321/rust/src/test/rustdoc-json/traits/supertrait.rs" "--output-format" "json" "-Zunstable-options" stdout: none stderr: none ```
1 parent c1aa854 commit c97f05c

File tree

1 file changed

+19
-15
lines changed

1 file changed

+19
-15
lines changed

src/tools/compiletest/src/runtest.rs

+19-15
Original file line numberDiff line numberDiff line change
@@ -3753,23 +3753,27 @@ pub struct ProcRes {
37533753

37543754
impl ProcRes {
37553755
pub fn print_info(&self) {
3756-
print!(
3757-
"\
3758-
status: {}\n\
3759-
command: {}\n\
3760-
stdout:\n\
3761-
------------------------------------------\n\
3762-
{}\n\
3763-
------------------------------------------\n\
3764-
stderr:\n\
3765-
------------------------------------------\n\
3766-
{}\n\
3767-
------------------------------------------\n\
3768-
\n",
3756+
fn render(name: &str, contents: &str) -> String {
3757+
let contents = json::extract_rendered(contents);
3758+
let contents = contents.trim();
3759+
if contents.is_empty() {
3760+
format!("{name}: none")
3761+
} else {
3762+
format!(
3763+
"\
3764+
--- {name} -------------------------------\n\
3765+
{contents}\n\
3766+
------------------------------------------",
3767+
)
3768+
}
3769+
}
3770+
3771+
println!(
3772+
"status: {}\ncommand: {}\n{}\n{}\n",
37693773
self.status,
37703774
self.cmdline,
3771-
json::extract_rendered(&self.stdout),
3772-
json::extract_rendered(&self.stderr),
3775+
render("stdout", &self.stdout),
3776+
render("stderr", &self.stderr),
37733777
);
37743778
}
37753779

0 commit comments

Comments
 (0)