Make output more like libtest

src/lib.rs

@@ -120,7 +120,7 @@ pub type Filter = Vec<(Match, &'static [u8])>;
 pub fn run_tests(config: Config) -> Result<()> {
     let args = Args::test();
     if !args.quiet {
-        eprintln!("   Compiler: {}", config.program.display());
+        eprintln!("Compiler: {}", config.program.display());
     }
 
     let name = config.root_dir.display().to_string();

src/status_emitter.rs

@@ -3,7 +3,7 @@
 use bstr::ByteSlice;
 use colored::Colorize;
 use crossbeam_channel::{Sender, TryRecvError};
-use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget};
+use indicatif::{MultiProgress, ProgressBar, ProgressDrawTarget, ProgressStyle};
 
 use crate::{
     github_actions, parser::Pattern, rustc_stderr::Message, Error, Errored, Errors, TestOk,
@@ -108,14 +108,15 @@ impl Text {
                                 }
                             }
                             Msg::Status(msg, status) => {
-                                threads
-                                    .get_mut(&msg)
-                                    .unwrap()
-                                    .set_message(format!("{msg} {status}"));
+                                threads.get_mut(&msg).unwrap().set_message(status);
                             }
                             Msg::Push(msg) => {
                                 let spinner =
-                                    bars.add(ProgressBar::new_spinner().with_message(msg.clone()));
+                                    bars.add(ProgressBar::new_spinner().with_prefix(msg.clone()));
+                                spinner.set_style(
+                                    ProgressStyle::with_template("{prefix} {spinner}{msg}")
+                                        .unwrap(),
+                                );
                                 threads.insert(msg, spinner);
                             }
                             Msg::IncLength => {
@@ -194,9 +195,9 @@ impl TestStatus for TextTest {
                 Ok(TestOk::Filtered) => return,
             };
             let old_msg = self.msg();
-            let msg = format!("{old_msg} ... {result}");
+            let msg = format!("... {result}");
             if ProgressDrawTarget::stderr().is_hidden() {
-                eprintln!("{msg}");
+                eprintln!("{old_msg} {msg}");
                 std::io::stderr().flush().unwrap();
             } else {
                 self.text.sender.send(Msg::Pop(old_msg, Some(msg))).unwrap();
@@ -288,13 +289,17 @@ impl StatusEmitter for Text {
         // Print all errors in a single thread to show reliable output
         if failures == 0 {
             eprintln!();
-            eprintln!(
-                "test result: {}. {} tests passed, {} ignored, {} filtered out",
-                "ok".green(),
-                succeeded.to_string().green(),
-                ignored.to_string().yellow(),
-                filtered.to_string().yellow(),
-            );
+            eprint!("test result: {}.", "ok".green());
+            if succeeded > 0 {
+                eprint!(" {} passed;", succeeded.to_string().green());
+            }
+            if ignored > 0 {
+                eprint!(" {} ignored;", ignored.to_string().yellow());
+            }
+            if filtered > 0 {
+                eprint!(" {} filtered out;", filtered.to_string().yellow());
+            }
+            eprintln!();
             eprintln!();
             Box::new(())
         } else {
@@ -330,14 +335,19 @@ impl StatusEmitter for Text {
                         eprintln!("{line}");
                     }
                     eprintln!();
-                    eprintln!(
-                        "test result: {}. {} tests failed, {} tests passed, {} ignored, {} filtered out",
-                        "FAIL".red(),
-                        self.failures.len().to_string().red().bold(),
-                        self.succeeded.to_string().green(),
-                        self.ignored.to_string().yellow(),
-                        self.filtered.to_string().yellow(),
-                    );
+                    eprint!("test result: {}.", "FAIL".red());
+                    eprint!(" {} failed;", self.failures.len().to_string().green());
+                    if self.succeeded > 0 {
+                        eprint!(" {} passed;", self.succeeded.to_string().green());
+                    }
+                    if self.ignored > 0 {
+                        eprint!(" {} ignored;", self.ignored.to_string().yellow());
+                    }
+                    if self.filtered > 0 {
+                        eprint!(" {} filtered out;", self.filtered.to_string().yellow());
+                    }
+                    eprintln!();
+                    eprintln!();
                 }
             }
             Box::new(Summarizer {

tests/integration.rs

@@ -77,9 +77,6 @@ fn run(name: &str, mode: Mode) -> Result<()> {
     config.stderr_filter("(src/.*?\\.rs):[0-9]+:[0-9]+", "$1:LL:CC");
     config.stderr_filter("program not found", "No such file or directory");
     config.stderr_filter(" \\(os error [0-9]+\\)", "");
-    // We emit this message on a thread, so it can sometimes happen that it
-    // appears earlier or later than the regular test messages.
-    config.stderr_filter("   Building test dependencies...\n", "");
 
     let text = if args.quiet {
         ui_test::status_emitter::Text::quiet()

tests/integrations/basic-bin/Cargo.stderr

@@ -1,5 +1,5 @@
 Building dependencies ... ok
 tests/actual_tests/foomp.rs ... ok
 
-test result: ok. 1 tests passed, 0 ignored, 0 filtered out
+test result: ok. 1 passed;
 

tests/integrations/basic-fail-mode/Cargo.stderr

@@ -1,5 +1,5 @@
 Building dependencies ... ok
 tests/actual_tests/foomp.rs ... ok
 
-test result: ok. 1 tests passed, 0 ignored, 0 filtered out
+test result: ok. 1 passed;
 

tests/integrations/basic-fail/Cargo.stderr

@@ -196,7 +196,8 @@ FAILURES:
     tests/actual_tests/foomp2.rs
     tests/actual_tests/pattern_too_many_arrow.rs
 
-test result: FAIL. 8 tests failed, 0 tests passed, 0 ignored, 0 filtered out
+test result: FAIL. 8 failed;
+
 Error: tests failed
 
 Location:
@@ -557,7 +558,8 @@ FAILURES:
     tests/actual_tests_bless/unknown_revision.rs
     tests/actual_tests_bless/unknown_revision2.rs
 
-test result: FAIL. 18 tests failed, 14 tests passed, 3 ignored, 0 filtered out
+test result: FAIL. 18 failed; 14 passed; 3 ignored;
+
 Building dependencies ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (foo) ... ok
 tests/actual_tests_bless_yolo/revisions_bad.rs (bar) ... FAILED
@@ -584,7 +586,8 @@ For more information about this error, try `rustc --explain E0601`.
 FAILURES:
     tests/actual_tests_bless_yolo/revisions_bad.rs (revision bar)
 
-test result: FAIL. 1 tests failed, 2 tests passed, 0 ignored, 0 filtered out
+test result: FAIL. 1 failed; 2 passed;
+
 thread 'main' panicked at 'invalid mode/result combo: yolo: Err(tests failed
 
 Location:
@@ -703,7 +706,8 @@ FAILURES:
     tests/actual_tests/foomp2.rs
     tests/actual_tests/pattern_too_many_arrow.rs
 
-test result: FAIL. 8 tests failed, 0 tests passed, 0 ignored, 0 filtered out
+test result: FAIL. 8 failed;
+
 Error: tests failed
 
 Location:

tests/integrations/basic/Cargo.stderr

@@ -11,5 +11,5 @@ tests/actual_tests/unicode.rs ... ok
 tests/actual_tests/windows_paths.rs ... ok
 tests/actual_tests/subdir/aux_proc_macro.rs ... ok
 
-test result: ok. 9 tests passed, 0 ignored, 0 filtered out
+test result: ok. 9 passed;