conditional compile test for wasm

Author: yoshuawuyts

src/bootstrap/test.rs

@@ -706,6 +706,7 @@ impl Step for Miri {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct CompiletestTest {
+    stage: u32,
     host: TargetSelection,
 }
 
@@ -717,13 +718,14 @@ impl Step for CompiletestTest {
     }
 
     fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(CompiletestTest { host: run.target });
+        run.builder.ensure(CompiletestTest { stage: run.builder.top_stage, host: run.target });
     }
 
     /// Runs `cargo test` for compiletest.
     fn run(self, builder: &Builder<'_>) {
         let host = self.host;
-        let compiler = builder.compiler(builder.top_stage, host);
+        let stage = self.stage;
+        let compiler = builder.compiler(stage, host);
 
         // We need `ToolStd` for the locally-built sysroot because
         // compiletest uses unstable features of the `test` crate.
@@ -739,6 +741,7 @@ impl Step for CompiletestTest {
             &[],
         );
         cargo.allow_features("test");
+        cargo.env("RUSTC_STAGE", stage.to_string());
         run_cargo_test(cargo, &[], &[], "compiletest", compiler, host, builder);
     }
 }

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

@@ -435,7 +435,7 @@ fn pointer_width() {
 
 #[test]
 fn wasm_special() {
-    let ignores = [
+    let mut ignores = vec![
         ("wasm32-unknown-unknown", "emscripten", true),
         ("wasm32-unknown-unknown", "wasm32", true),
         ("wasm32-unknown-unknown", "wasm32-bare", true),
@@ -446,15 +446,32 @@ fn wasm_special() {
         ("wasm32-unknown-emscripten", "emscripten", true),
         ("wasm32-unknown-emscripten", "wasm32", true),
         ("wasm32-unknown-emscripten", "wasm32-bare", false),
-        ("wasm32-wasi-preview1", "emscripten", false),
-        ("wasm32-wasi-preview1", "wasm32", true),
-        ("wasm32-wasi-preview1", "wasm32-bare", false),
-        ("wasm32-wasi-preview1", "wasi", true),
         ("wasm64-unknown-unknown", "emscripten", false),
         ("wasm64-unknown-unknown", "wasm32", false),
         ("wasm64-unknown-unknown", "wasm32-bare", false),
         ("wasm64-unknown-unknown", "wasm64", true),
     ];
+
+    // FIXME(yosh): We're updating the "wasm32-wasi" target name to "wasm32-wasi-preview1".
+    // The MinGW tests run a beta compiler on stage 0 which means we're having a target mismatch
+    // for a brief period. When a new beta release is cut, the `if` part of this conditional should be
+    // removed, and the `else` part should be re-inlined in the original `ignores` list.
+    if env!("RUSTC_STAGE") == "0" {
+        ignores.append(&mut vec![
+            ("wasm32-wasi", "emscripten", false),
+            ("wasm32-wasi", "wasm32", true),
+            ("wasm32-wasi", "wasm32-bare", false),
+            ("wasm32-wasi", "wasi", true),
+        ]);
+    } else {
+        ignores.append(&mut vec![
+            ("wasm32-wasi-preview1", "emscripten", false),
+            ("wasm32-wasi-preview1", "wasm32", true),
+            ("wasm32-wasi-preview1", "wasm32-bare", false),
+            ("wasm32-wasi-preview1", "wasi", true),
+        ]);
+    }
+
     for (target, pattern, ignore) in ignores {
         let mut config = config();
         config.target = target.to_string();