show which test the rmake process belongs to

rust-lang · Dec 12, 2024 · 2a71007 · 2a71007
1 parent 3b463bd
commit 2a71007
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -1836,7 +1836,20 @@ impl<'test> TestCx<'test> {
             return;
         }
 
-        let proc_name = Path::new(proc_name).file_name().unwrap().to_string_lossy();
+        let path = Path::new(proc_name);
+        let proc_name = if path.file_stem() == Some(OsStr::new("rmake")) {
+            OsString::from_iter(
+                path.parent()
+                    .unwrap()
+                    .file_name()
+                    .into_iter()
+                    .chain(Some(OsStr::new("/")))
+                    .chain(path.file_name()),
+            )
+        } else {
+            path.file_name().unwrap().into()
+        };
+        let proc_name = proc_name.to_string_lossy();
         eprintln!("------{proc_name} stdout------------------------------");
         eprintln!("{}", out);
         eprintln!("------{proc_name} stderr------------------------------");