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

Prevent miri from being distributed if tests are failing #61656

Closed
wants to merge 1 commit into from
Closed

Prevent miri from being distributed if tests are failing #61656

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
7 changes: 5 additions & 2 deletions src/bootstrap/dist.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,8 +1192,6 @@ impl Step for Rls {
t!(fs::create_dir_all(&image));

// Prepare the image directory
// We expect RLS to build, because we've exited this step above if tool
// state for RLS isn't testing.
let rls = builder.ensure(tool::Rls {
compiler,
target,
Expand Down Expand Up @@ -1274,6 +1272,11 @@ impl Step for Clippy {
let image = tmp.join("clippy-image");
drop(fs::remove_dir_all(&image));
builder.create_dir(&image);

if !builder.config.toolstate.miri.testing() {
println!("skipping Dist Miri stage{} ({})", stage, target);
return None
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason you do this after the tempdir is already created?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, uh, this is in the Clippy impl...? Shouldn't the same be added for Miri then?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was also about to ask what this testing method tests, but CI already says it does not even exist. ;)

== TestPass is anyway clearer, IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea... I just did this via copy paste in the github interface. Working with a local build now to get this actually working


// Prepare the image directory
// We expect clippy to build, because we've exited this step above if tool
Expand Down