Skip to content

Commit 22e27f1

Browse files
authored
Rollup merge of rust-lang#44630 - RalfJung:compiletest, r=Mark-Simulacrum
compiletest: print the correct basename of the src dir See <Manishearth/compiletest-rs#76>. Fixes rust-lang#40712
2 parents cd63d16 + 83589f2 commit 22e27f1

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/tools/compiletest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ pub fn make_test_name(config: &Config, testpaths: &TestPaths) -> test::TestName
517517
//
518518
// run-pass/foo/bar/baz.rs
519519
let path =
520-
PathBuf::from(config.mode.to_string())
520+
PathBuf::from(config.src_base.file_name().unwrap())
521521
.join(&testpaths.relative_dir)
522522
.join(&testpaths.file.file_name().unwrap());
523523
test::DynTestName(format!("[{}] {}", config.mode, path.display()))

src/tools/compiletest/src/runtest.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2174,8 +2174,6 @@ actual:\n\
21742174
}
21752175

21762176
fn run_ui_test(&self) {
2177-
println!("ui: {}", self.testpaths.file.display());
2178-
21792177
let proc_res = self.compile_test();
21802178

21812179
let expected_stderr_path = self.expected_output_path("stderr");

0 commit comments

Comments
 (0)