Skip to content

Commit 4f8d4ca

Browse files
committed
Update codegen_{cranelift,gcc} and opt-dist to use build.compiletest-allow-stage0
1 parent 013b3eb commit 4f8d4ca

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

build_system/src/test.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,6 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
561561
// FIXME: create a function "display_if_not_quiet" or something along the line.
562562
println!("[TEST] rustc asm test suite");
563563

564-
env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());
565-
566564
let codegen_backend_path = format!(
567565
"{pwd}/target/{channel}/librustc_codegen_gcc.{dylib_ext}",
568566
pwd = std::env::current_dir()
@@ -588,6 +586,8 @@ fn asm_tests(env: &Env, args: &TestArg) -> Result<(), String> {
588586
&"always",
589587
&"--stage",
590588
&"0",
589+
&"--set",
590+
&"build.compiletest-allow-stage0=true",
591591
&"tests/assembly-llvm/asm",
592592
&"--compiletest-rustc-args",
593593
&rustc_args,
@@ -1047,7 +1047,6 @@ where
10471047

10481048
// FIXME: create a function "display_if_not_quiet" or something along the line.
10491049
println!("[TEST] rustc {test_type} test suite");
1050-
env.insert("COMPILETEST_FORCE_STAGE0".to_string(), "1".to_string());
10511050

10521051
let extra =
10531052
if args.is_using_gcc_master_branch() { "" } else { " -Csymbol-mangling-version=v0" };
@@ -1070,6 +1069,8 @@ where
10701069
&"always",
10711070
&"--stage",
10721071
&"0",
1072+
&"--set",
1073+
&"build.compiletest-allow-stage0=true",
10731074
&format!("tests/{test_type}"),
10741075
&"--compiletest-rustc-args",
10751076
&rustc_args,

0 commit comments

Comments
 (0)