Skip to content

Commit a04c8a0

Browse files
yoshuawuytsjyn514
andcommitted
update feedback from review
Co-Authored-By: jyn <github@jyn.dev>
1 parent f066a51 commit a04c8a0

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

src/bootstrap/test.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,6 @@ impl Step for Miri {
706706

707707
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
708708
pub struct CompiletestTest {
709-
stage: u32,
710709
host: TargetSelection,
711710
}
712711

@@ -718,14 +717,13 @@ impl Step for CompiletestTest {
718717
}
719718

720719
fn make_run(run: RunConfig<'_>) {
721-
run.builder.ensure(CompiletestTest { stage: run.builder.top_stage, host: run.target });
720+
run.builder.ensure(CompiletestTest { host: run.target });
722721
}
723722

724723
/// Runs `cargo test` for compiletest.
725724
fn run(self, builder: &Builder<'_>) {
726725
let host = self.host;
727-
let stage = self.stage;
728-
let compiler = builder.compiler(stage, host);
726+
let compiler = builder.compiler(builder.top_stage, host);
729727

730728
// We need `ToolStd` for the locally-built sysroot because
731729
// compiletest uses unstable features of the `test` crate.
@@ -741,7 +739,7 @@ impl Step for CompiletestTest {
741739
&[],
742740
);
743741
cargo.allow_features("test");
744-
cargo.env("RUSTC_STAGE", stage.to_string());
742+
cargo.env("RUSTC_STAGE", builder.top_stage.to_string());
745743
run_cargo_test(cargo, &[], &[], "compiletest", compiler, host, builder);
746744
}
747745
}

src/tools/compiletest/src/header/tests.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@ fn wasm_special() {
456456
// The MinGW tests run a beta compiler on stage 0 which means we're having a target mismatch
457457
// for a brief period. When a new beta release is cut, the `if` part of this conditional should be
458458
// removed, and the `else` part should be re-inlined in the original `ignores` list.
459+
// cfg(bootstrap)
459460
if env!("RUSTC_STAGE") == "0" {
460461
ignores.append(&mut vec![
461462
("wasm32-wasi", "emscripten", false),

0 commit comments

Comments
 (0)