From 474c717644c13a86c5bd40a8c3fd6f0e1519f126 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 16 Sep 2017 13:02:31 +0200 Subject: [PATCH 1/2] compiletest: print the correct basename of the src dir --- src/tools/compiletest/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 15216f52d91fd..26c447d01d364 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -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())) From 83589f2808ebf78fb701d5238d71595e9ce1eff9 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 16 Sep 2017 13:06:50 +0200 Subject: [PATCH 2/2] fix test name being printed twice for ui tests --- src/tools/compiletest/src/runtest.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index d2a0c776b33e6..10ef326d9db8c 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -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");