From 30931eeecb047d1729d7c709af4036e20f20c5ea Mon Sep 17 00:00:00 2001
From: Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de>
Date: Mon, 18 Jul 2022 09:02:40 +0000
Subject: [PATCH] Add a dedicated thread for output printing

---
 ui_test/src/lib.rs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ui_test/src/lib.rs b/ui_test/src/lib.rs
index 4318e8a8e03..ee20920e54f 100644
--- a/ui_test/src/lib.rs
+++ b/ui_test/src/lib.rs
@@ -123,11 +123,22 @@ pub fn run_tests(mut config: Config) -> Result<()> {
             drop(submit);
         });
 
+        // A channel for the messages emitted by the individual test threads.
+        let (finish_file, finished_files) = crossbeam::channel::unbounded();
+
+        s.spawn(|_| {
+            for msg in finished_files {
+                eprintln!("{msg}");
+            }
+        });
+
         let mut threads = vec![];
 
         // Create N worker threads that receive files to test.
         for _ in 0..std::thread::available_parallelism().unwrap().get() {
+            let finish_file = finish_file.clone();
             threads.push(s.spawn(|_| -> Result<()> {
+                let finish_file = finish_file;
                 for path in &receive {
                     if !config.path_filter.is_empty() {
                         let path_display = path.display().to_string();
@@ -140,11 +151,12 @@ pub fn run_tests(mut config: Config) -> Result<()> {
                     // Ignore file if only/ignore rules do (not) apply
                     if !test_file_conditions(&comments, &target, &config) {
                         ignored.fetch_add(1, Ordering::Relaxed);
-                        eprintln!(
+                        let msg = format!(
                             "{} ... {}",
                             path.display(),
                             "ignored (in-test comment)".yellow()
                         );
+                        finish_file.send(msg)?;
                         continue;
                     }
                     // Run the test for all revisions
@@ -161,10 +173,10 @@ pub fn run_tests(mut config: Config) -> Result<()> {
                         }
                         write!(msg, "... ").unwrap();
                         if errors.is_empty() {
-                            eprintln!("{msg}{}", "ok".green());
+                            write!(msg, "{}", "ok".green()).unwrap();
                             succeeded.fetch_add(1, Ordering::Relaxed);
                         } else {
-                            eprintln!("{msg}{}", "FAILED".red().bold());
+                            write!(msg, "{}", "FAILED".red().bold()).unwrap();
                             failures.lock().unwrap().push((
                                 path.clone(),
                                 m,
@@ -173,11 +185,13 @@ pub fn run_tests(mut config: Config) -> Result<()> {
                                 stderr,
                             ));
                         }
+                        finish_file.send(msg)?;
                     }
                 }
                 Ok(())
             }));
         }
+
         for thread in threads {
             thread.join().unwrap()?;
         }
-- 
2.44.0