Skip to content

Commit 056eb75

Browse files
committed
show which test the rmake process belongs to
1 parent da535b9 commit 056eb75

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

src/tools/compiletest/src/runtest.rs

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::borrow::Cow;
22
use std::collections::{HashMap, HashSet};
3-
use std::ffi::OsString;
3+
use std::ffi::{OsStr, OsString};
44
use std::fs::{self, File, create_dir_all};
55
use std::hash::{DefaultHasher, Hash, Hasher};
66
use std::io::prelude::*;
@@ -1836,7 +1836,20 @@ impl<'test> TestCx<'test> {
18361836
return;
18371837
}
18381838

1839-
let proc_name = Path::new(proc_name).file_name().unwrap().to_string_lossy();
1839+
let path = Path::new(proc_name);
1840+
let proc_name = if path.file_stem().is_some_and(|p| p == "rmake") {
1841+
OsString::from_iter(
1842+
path.parent()
1843+
.unwrap()
1844+
.file_name()
1845+
.into_iter()
1846+
.chain(Some(OsStr::new("/")))
1847+
.chain(path.file_name()),
1848+
)
1849+
} else {
1850+
path.file_name().unwrap().into()
1851+
};
1852+
let proc_name = proc_name.to_string_lossy();
18401853
println!("------{proc_name} stdout------------------------------");
18411854
println!("{}", out);
18421855
println!("------{proc_name} stderr------------------------------");

0 commit comments

Comments
 (0)