From 4cdb783cb9813ab3f627303e6d763a49ee730e33 Mon Sep 17 00:00:00 2001 From: Pietro Albini Date: Fri, 10 Mar 2023 15:29:09 +0100 Subject: [PATCH] migrate existing behavior of matches_arch --- src/tools/compiletest/src/header/cfg.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/tools/compiletest/src/header/cfg.rs b/src/tools/compiletest/src/header/cfg.rs index dbc78dd521b..747cf10bd34 100644 --- a/src/tools/compiletest/src/header/cfg.rs +++ b/src/tools/compiletest/src/header/cfg.rs @@ -1,7 +1,7 @@ use crate::common::{CompareMode, Config, Debugger}; use std::collections::HashSet; -const EXTRA_ARCHS: &[&str] = &["asmjs", "spirv"]; +const EXTRA_ARCHS: &[&str] = &["spirv"]; /// Parses a name-value directive which contains config-specific information, e.g., `ignore-x86` /// or `normalize-stderr-32bit`. @@ -133,6 +133,17 @@ pub(super) fn parse_cfg_name_directive<'a>( message: "when the target is WASM" } + condition! { + name: "asmjs", + condition: config.target.starts_with("asmjs"), + message: "when the architecture is asm.js", + } + condition! { + name: "thumb", + condition: config.target.starts_with("thumb"), + message: "when the architecture is part of the Thumb family" + } + condition! { name: &config.channel, allowed_names: &["stable", "beta", "nightly"],