Skip to content

Fix a compiletest blessing message #140953

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

Merged
merged 1 commit into from
May 15, 2025
Merged

Fix a compiletest blessing message #140953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 12 additions & 8 deletions src/tools/compiletest/src/runtest.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2609,18 +2609,19 @@ impl<'test> TestCx<'test> {
(expected, actual)
};

// Write the actual output to a file in build/
let test_name = self.config.compare_mode.as_ref().map_or("", |m| m.to_str());
// Write the actual output to a file in build directory.
let actual_path = self
.output_base_name()
.with_extra_extension(self.revision.unwrap_or(""))
.with_extra_extension(test_name)
.with_extra_extension(
self.config.compare_mode.as_ref().map(|cm| cm.to_str()).unwrap_or(""),
)
.with_extra_extension(stream);

if let Err(err) = fs::write(&actual_path, &actual) {
self.fatal(&format!("failed to write {stream} to `{actual_path:?}`: {err}",));
self.fatal(&format!("failed to write {stream} to `{actual_path}`: {err}",));
}
println!("Saved the actual {stream} to {actual_path:?}");
println!("Saved the actual {stream} to `{actual_path}`");

if !self.config.bless {
if expected.is_empty() {
Expand All @@ -2646,13 +2647,16 @@ impl<'test> TestCx<'test> {

if !actual.is_empty() {
if let Err(err) = fs::write(&expected_path, &actual) {
self.fatal(&format!("failed to write {stream} to `{expected_path:?}`: {err}"));
self.fatal(&format!("failed to write {stream} to `{expected_path}`: {err}"));
}
println!("Blessing the {stream} of {test_name} in {expected_path:?}");
println!(
"Blessing the {stream} of `{test_name}` as `{expected_path}`",
test_name = self.testpaths.file
);
}
}

println!("\nThe actual {0} differed from the expected {0}.", stream);
println!("\nThe actual {stream} differed from the expected {stream}");

if self.config.bless { CompareOutcome::Blessed } else { CompareOutcome::Differed }
}
Expand Down
Loading