nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-01-11 15:23:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #44630 - RalfJung:compiletest, r=Mark-Simulacrum

Browse Source 
compiletest: print the correct basename of the src dir

See <https://github.com/laumann/compiletest-rs/issues/76>.

Fixes #40712
This commit is contained in:
Tim Neumann 2017-09-17 13:19:13 +02:00 committed by GitHub
commit 6b1f0c8694
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/compiletest/src/main.rs
View File

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

2
src/tools/compiletest/src/runtest.rs
View File

@ -2174,8 +2174,6 @@ actual:\n\
}
fn run_ui_test(&self) {
println!("ui: {}", self.testpaths.file.display());
let proc_res = self.compile_test();
let expected_stderr_path = self.expected_output_path("stderr");