Skip to content

Commit 654513e

Browse files
committed
use local-rebuild instead of BOOTSTRAP_SKIP_TARGET_SANITY workaround
Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 041b59e commit 654513e

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

src/tools/opt-dist/src/tests.rs

+2-7
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ change-id = 115898
6767
[build]
6868
rustc = "{rustc}"
6969
cargo = "{cargo}"
70+
local-rebuild = true
7071
7172
[target.{host_triple}]
7273
llvm-config = "{llvm_config}"
@@ -102,13 +103,7 @@ llvm-config = "{llvm_config}"
102103
for test_path in env.skipped_tests() {
103104
args.extend(["--skip", test_path]);
104105
}
105-
cmd(&args)
106-
.env("COMPILETEST_FORCE_STAGE0", "1")
107-
// Above we override the stage 0 compiler with previously compiled compiler,
108-
// which can cause confusion in bootstrap's target sanity checks.
109-
.env("BOOTSTRAP_SKIP_TARGET_SANITY", "1")
110-
.run()
111-
.context("Cannot execute tests")
106+
cmd(&args).env("COMPILETEST_FORCE_STAGE0", "1").run().context("Cannot execute tests")
112107
}
113108

114109
/// Tries to find the version of the dist artifacts (either nightly, beta, or 1.XY.Z).

0 commit comments

Comments
 (0)