Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compiletest: print the correct basename of the src dir #44630

Merged
merged 2 commits into from
Sep 17, 2017
Merged

compiletest: print the correct basename of the src dir #44630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
474c717
compiletest: print the correct basename of the src dir
RalfJung Sep 16, 2017
83589f2
fix test name being printed twice for ui tests
RalfJung Sep 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tools/compiletest/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down
2 changes: 0 additions & 2 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down