diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-08-30 01:43:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-30 01:43:52 +0200 |
| commit | 3b9ca2cb5208526275f79e41a87f7dde22cb1a8b (patch) | |
| tree | ae58cf2c8e3e99e58b0a9f7122250b3aeb53aafe /src | |
| parent | 9225aabef402011d1ed1f84a02fbef1f3ab13872 (diff) | |
| parent | e6a2c8292b146ff4c6199aa6a60d739105bb9a54 (diff) | |
| download | rust-3b9ca2cb5208526275f79e41a87f7dde22cb1a8b.tar.gz rust-3b9ca2cb5208526275f79e41a87f7dde22cb1a8b.zip | |
Rollup merge of #75975 - matklad:snapshot-tests, r=Mark-Simulacrum
Allow --bess ing expect-tests in tools I haven't tried this, but I think this should do the trick, as `RustdocCrate` is a special step in bootstrap, which uses `tool_caro` r? @ghost
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/builder.rs | 5 | ||||
| -rw-r--r-- | src/bootstrap/test.rs | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs index 6446fa7550d..54eb2e99b8f 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs @@ -1079,6 +1079,11 @@ impl<'a> Builder<'a> { }, ); + if self.config.cmd.bless() { + // Bless `expect!` tests. + cargo.env("UPDATE_EXPECT", "1"); + } + if !mode.is_tool() { cargo.env("RUSTC_FORCE_UNSTABLE", "1"); } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index afa72b5d58c..ac833a55d4c 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -1754,11 +1754,6 @@ impl Step for Crate { cargo.arg("--quiet"); } - if builder.config.cmd.bless() { - // Bless `expect!` tests. - cargo.env("UPDATE_EXPECT", "1"); - } - if target.contains("emscripten") { cargo.env( format!("CARGO_TARGET_{}_RUNNER", envify(&target.triple)), |