Skip to content

Commit 64efbe2

Browse files
committed
Prune invalid ignore-mode-* directives
These are only valid for coverage test modes.
1 parent a964a92 commit 64efbe2

3 files changed

Lines changed: 3 additions & 21 deletions

File tree

‎src/tools/compiletest/src/command-list.rs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,8 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
6464
"ignore-loongarch64",
6565
"ignore-macabi",
6666
"ignore-macos",
67-
"ignore-mode-assembly",
68-
"ignore-mode-codegen",
69-
"ignore-mode-codegen-units",
7067
"ignore-mode-coverage-map",
7168
"ignore-mode-coverage-run",
72-
"ignore-mode-crashes",
73-
"ignore-mode-debuginfo",
74-
"ignore-mode-incremental",
75-
"ignore-mode-js-doc-test",
76-
"ignore-mode-mir-opt",
77-
"ignore-mode-pretty",
78-
"ignore-mode-run-make",
79-
"ignore-mode-run-pass-valgrind",
80-
"ignore-mode-rustdoc",
81-
"ignore-mode-rustdoc-json",
82-
"ignore-mode-ui",
83-
"ignore-mode-ui-fulldeps",
8469
"ignore-msp430",
8570
"ignore-msvc",
8671
"ignore-musl",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::collections::HashSet;
22

3-
usecrate::common::{CompareMode,Config,Debugger,Mode};
3+
usecrate::common::{CompareMode,Config,Debugger};
44
usecrate::header::IgnoreDecision;
55

66
constEXTRA_ARCHS:&[&str] = &["spirv"];
@@ -222,7 +222,7 @@ pub(super) fn parse_cfg_name_directive<'a>(
222222
name: format!("mode-{}", config.mode.to_str()),
223223
allowed_names:ContainsPrefixed{
224224
prefix:"mode-",
225-
inner:Mode::STR_VARIANTS,
225+
inner:["coverage-run","coverage-map"],
226226
},
227227
message:"when the test mode is {name}",
228228
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::io::Read;
22
use std::path::Path;
3-
use std::str::FromStr;
43

54
usesuper::iter_header;
65
usecrate::common::{Config,Debugger,Mode};
@@ -574,14 +573,12 @@ fn families() {
574573

575574
#[test]
576575
fnignore_mode(){
577-
for&mode inMode::STR_VARIANTS{
576+
for mode in["coverage-map","coverage-run"]{
578577
// Indicate profiler support so that "coverage-run" tests aren't skipped.
579578
let config:Config = cfg().mode(mode).profiler_support(true).build();
580579
let other = if mode == "coverage-run"{"coverage-map"}else{"coverage-run"};
581580

582581
assert_ne!(mode, other);
583-
assert_eq!(config.mode,Mode::from_str(mode).unwrap());
584-
assert_ne!(config.mode,Mode::from_str(other).unwrap());
585582

586583
assert!(check_ignore(&config,&format!("//@ ignore-mode-{mode}")));
587584
assert!(!check_ignore(&config,&format!("//@ ignore-mode-{other}")));

0 commit comments

Comments
 (0)