Skip to content

Commit

Permalink
use local-rebuild instead of BOOTSTRAP_SKIP_TARGET_SANITY workaround
Browse files Browse the repository at this point in the history
Signed-off-by: onur-ozkan <work@onurozkan.dev>
  • Loading branch information
onur-ozkan committed Sep 12, 2024
1 parent 041b59e commit 654513e
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions src/tools/opt-dist/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ change-id = 115898
[build]
rustc = "{rustc}"
cargo = "{cargo}"
local-rebuild = true
[target.{host_triple}]
llvm-config = "{llvm_config}"
Expand Down Expand Up @@ -102,13 +103,7 @@ llvm-config = "{llvm_config}"
for test_path in env.skipped_tests() {
args.extend(["--skip", test_path]);
}
cmd(&args)
.env("COMPILETEST_FORCE_STAGE0", "1")
// Above we override the stage 0 compiler with previously compiled compiler,
// which can cause confusion in bootstrap's target sanity checks.
.env("BOOTSTRAP_SKIP_TARGET_SANITY", "1")
.run()
.context("Cannot execute tests")
cmd(&args).env("COMPILETEST_FORCE_STAGE0", "1").run().context("Cannot execute tests")
}

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

0 comments on commit 654513e

Please sign in to comment.