diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-09-10 10:52:27 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-09-20 16:39:13 -0400 |
| commit | cf33aad8fdd3885fbc26518aaccff0788d1a21a7 (patch) | |
| tree | 2150089ec9d3ce82e5456df9c170412e3efa68b6 /src/bootstrap | |
| parent | 1aac99de25d3e28e4b2a16e8fbe6737d5202f27a (diff) | |
| download | rust-cf33aad8fdd3885fbc26518aaccff0788d1a21a7.tar.gz rust-cf33aad8fdd3885fbc26518aaccff0788d1a21a7.zip | |
Specify output directory for bootstrap tests
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/builder/tests.rs | 3 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/builder/tests.rs b/src/bootstrap/builder/tests.rs index f96925f9270..cd90021507e 100644 --- a/src/bootstrap/builder/tests.rs +++ b/src/bootstrap/builder/tests.rs @@ -10,6 +10,9 @@ fn configure(cmd: &str, host: &[&str], target: &[&str]) -> Config { 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()); let dir = config .out .join("tmp-rustbuild-tests") diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index a9a8d3783fd..00522ee6b67 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -2024,6 +2024,8 @@ impl Step for Bootstrap { .current_dir(builder.src.join("src/bootstrap")) .env("RUSTFLAGS", "-Cdebuginfo=2") .env("CARGO_TARGET_DIR", builder.out.join("bootstrap")) + .env("BOOTSTRAP_OUTPUT_DIRECTORY", &builder.config.out) + .env("BOOTSTRAP_INITIAL_CARGO", &builder.config.initial_cargo) .env("RUSTC_BOOTSTRAP", "1") .env("RUSTC", &builder.initial_rustc); if let Some(flags) = option_env!("RUSTFLAGS") { |