about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2023-08-22 10:29:26 +0200
committerRalf Jung <post@ralfj.de>2023-08-22 10:29:26 +0200
commit6117fa1fefd91afeb4cc05f3cbc9f54f51e7bf42 (patch)
treeb02274b62c1e620c48486505815d5d2189713e2f
parenta5ba57e415f14b8c3d709642bf31a0a354261caa (diff)
downloadrust-6117fa1fefd91afeb4cc05f3cbc9f54f51e7bf42.tar.gz
rust-6117fa1fefd91afeb4cc05f3cbc9f54f51e7bf42.zip
make sure './miri many-seeds ./miri run' does not re-invoke the auto-ops
-rw-r--r--src/tools/miri/miri-script/src/commands.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/miri/miri-script/src/commands.rs b/src/tools/miri/miri-script/src/commands.rs
index ebaef1fd475..cdfb97cee68 100644
--- a/src/tools/miri/miri-script/src/commands.rs
+++ b/src/tools/miri/miri-script/src/commands.rs
@@ -94,8 +94,8 @@ impl Command {
             | Command::Cargo { .. } => Self::auto_actions()?,
             | Command::ManySeeds { .. }
             | Command::Toolchain { .. }
-            | Command::RustcPull { .. }
             | Command::Bench { .. }
+            | Command::RustcPull { .. }
             | Command::RustcPush { .. } => {}
         }
         // Then run the actual command.
@@ -295,6 +295,7 @@ impl Command {
             bail!("expected many-seeds command to be non-empty");
         };
         let sh = Shell::new()?;
+        sh.set_var("MIRI_AUTO_OPS", "no"); // just in case we get recursively invoked
         for seed in seed_start..seed_end {
             println!("Trying seed: {seed}");
             let mut miriflags = env::var_os("MIRIFLAGS").unwrap_or_default();