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
This commit is contained in:
Dylan DPC 2020-08-30 01:43:52 +02:00 committed by GitHub
commit 3b9ca2cb52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -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");
}

View file

@ -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)),