fix remaining tests

Author: pietroalbini

src/bootstrap/test.rs

@@ -694,7 +694,7 @@ impl Step for CompiletestTest {
     /// Runs `cargo test` for compiletest.
     fn run(self, builder: &Builder<'_>) {
         let host = self.host;
-        let compiler = builder.compiler(0, host);
+        let compiler = builder.compiler(1, host);
 
         // We need `ToolStd` for the locally-built sysroot because
         // compiletest uses unstable features of the `test` crate.

src/tools/compiletest/src/common.rs

@@ -490,7 +490,7 @@ impl TargetCfgs {
 #[serde(rename_all = "kebab-case")]
 pub struct TargetCfg {
     pub(crate) arch: String,
-    #[serde(default)]
+    #[serde(default = "default_os")]
     pub(crate) os: String,
     #[serde(default)]
     pub(crate) env: String,
@@ -506,6 +506,10 @@ pub struct TargetCfg {
     panic: PanicStrategy,
 }
 
+fn default_os() -> String {
+    "none".into()
+}
+
 #[derive(Eq, PartialEq, Clone, Debug, Default, serde::Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub enum Endian {

src/tools/compiletest/src/header/cfg.rs

@@ -70,7 +70,12 @@ pub(super) fn parse_cfg_name_directive<'a>(
         message: "when the target is {name}"
     }
     condition! {
-        name: &target_cfg.os,
+        name: &[
+            Some(&*target_cfg.os),
+            // If something is ignored for emscripten, it likely also needs to be
+            // ignored for wasm32-unknown-unknown.
+            (config.target == "wasm32-unknown-unknown").then_some("emscripten"),
+        ],
         allowed_names: &target_cfgs.all_oses,
         message: "when the operative system is {name}"
     }
@@ -100,16 +105,9 @@ pub(super) fn parse_cfg_name_directive<'a>(
         message: "when the target family is {name}"
     }
 
-    // If something is ignored for emscripten, it likely also needs to be
-    // ignored for wasm32-unknown-unknown.
     // `wasm32-bare` is an alias to refer to just wasm32-unknown-unknown
     // (in contrast to `wasm32` which also matches non-bare targets like
     // asmjs-unknown-emscripten).
-    condition! {
-        name: "emscripten",
-        condition: config.target == "wasm32-unknown-unknown",
-        message: "when the target is WASM",
-    }
     condition! {
         name: "wasm32-bare",
         condition: config.target == "wasm32-unknown-unknown",
@@ -144,7 +142,7 @@ pub(super) fn parse_cfg_name_directive<'a>(
     }
     condition! {
         name: config.stage_id.split('-').next().unwrap(),
-        allowed_names: &["stable", "beta", "nightly"],
+        allowed_names: &["stage0", "stage1", "stage2"],
         message: "when the bootstrapping stage is {name}",
     }
     condition! {
@@ -287,6 +285,12 @@ impl<T: CustomMatches> CustomMatches for &[T] {
     }
 }
 
+impl<const N: usize, T: CustomMatches> CustomMatches for [T; N] {
+    fn custom_matches(&self, name: &str) -> bool {
+        self.iter().any(|m| m.custom_matches(name))
+    }
+}
+
 impl<T: CustomMatches> CustomMatches for Option<T> {
     fn custom_matches(&self, name: &str) -> bool {
         match self {

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

@@ -47,7 +47,7 @@ fn config() -> Config {
         "--src-base=",
         "--build-base=",
         "--sysroot-base=",
-        "--stage-id=stage2",
+        "--stage-id=stage2-x86_64-unknown-linux-gnu",
         "--cc=c",
         "--cxx=c++",
         "--cflags=",
@@ -174,7 +174,7 @@ fn ignore_target() {
     assert!(check_ignore(&config, "// ignore-gnu"));
     assert!(check_ignore(&config, "// ignore-64bit"));
 
-    assert!(!check_ignore(&config, "// ignore-i686"));
+    assert!(!check_ignore(&config, "// ignore-x86"));
     assert!(!check_ignore(&config, "// ignore-windows"));
     assert!(!check_ignore(&config, "// ignore-msvc"));
     assert!(!check_ignore(&config, "// ignore-32bit"));
@@ -200,7 +200,7 @@ fn only_target() {
 #[test]
 fn stage() {
     let mut config = config();
-    config.stage_id = "stage1".to_owned();
+    config.stage_id = "stage1-x86_64-unknown-linux-gnu".to_owned();
 
     assert!(check_ignore(&config, "// ignore-stage1"));
     assert!(!check_ignore(&config, "// ignore-stage2"));