about summary refs log tree commit diff
path: root/src/bootstrap/builder
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2022-02-06 21:24:47 -0600
committerMark Rousskov <mark.simulacrum@gmail.com>2022-03-07 17:06:11 -0500
commit984527f7bb49bd6e2d34e65d7629d2e0cdc464f6 (patch)
tree60d058182a3e006ee4f6670ec2eaa41286a25e9b /src/bootstrap/builder
parent62b522ec3a8967501466bfe8889fe54667c4e4d1 (diff)
downloadrust-984527f7bb49bd6e2d34e65d7629d2e0cdc464f6.tar.gz
rust-984527f7bb49bd6e2d34e65d7629d2e0cdc464f6.zip
fix weird bug when `out` would get overridden by unit tests
Diffstat (limited to 'src/bootstrap/builder')
-rw-r--r--src/bootstrap/builder/tests.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs
index bc710344969..bd0be6da0b1 100644
--- a/src/bootstrap/builder/tests.rs
+++ b/src/bootstrap/builder/tests.rs
@@ -3,15 +3,15 @@ use crate::config::{Config, TargetSelection};
 use std::thread;
 
 fn configure(cmd: &str, host: &[&str], target: &[&str]) -> Config {
-    let mut config = Config::parse(&[cmd.to_owned()]);
+    let mut config = Config::parse(&[cmd.to_owned()], true);
     // don't save toolstates
     config.save_toolstates = None;
     config.dry_run = true;
     config.ninja_in_file = false;
-    // try to avoid spurious failures in dist where we create/delete each others file
     config.out = PathBuf::from(env::var_os("BOOTSTRAP_OUTPUT_DIRECTORY").unwrap());
     config.initial_rustc = PathBuf::from(env::var_os("RUSTC").unwrap());
     config.initial_cargo = PathBuf::from(env::var_os("BOOTSTRAP_INITIAL_CARGO").unwrap());
+    // try to avoid spurious failures in dist where we create/delete each others file
     let dir = config
         .out
         .join("tmp-rustbuild-tests")