From 4704992d70b828476738e38d999b079cabdb676e Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Sat, 8 Jun 2019 11:41:35 +0200 Subject: [PATCH] Prevent miri from being distributed if tests are failing --- src/bootstrap/dist.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs index 274961916183a..7b19b14a97652 100644 --- a/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs @@ -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, @@ -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 + } // Prepare the image directory // We expect clippy to build, because we've exited this step above if tool