Prune invalid ignore-mode-* directives · rust-lang/rust@64efbe2 (original) (raw)
File tree
3 files changed
lines changed
- src/tools/compiletest/src
3 files changed
lines changed
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -64,23 +64,8 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ | ||
| 64 | 64 | "ignore-loongarch64", |
| 65 | 65 | "ignore-macabi", |
| 66 | 66 | "ignore-macos", |
| 67 | -"ignore-mode-assembly", | |
| 68 | -"ignore-mode-codegen", | |
| 69 | -"ignore-mode-codegen-units", | |
| 70 | 67 | "ignore-mode-coverage-map", |
| 71 | 68 | "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", | |
| 84 | 69 | "ignore-msp430", |
| 85 | 70 | "ignore-msvc", |
| 86 | 71 | "ignore-musl", |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | use std::collections::HashSet; |
| 2 | 2 | |
| 3 | -use crate::common::{CompareMode, Config, Debugger, Mode}; | |
| 3 | +use crate::common::{CompareMode, Config, Debugger}; | |
| 4 | 4 | use crate::header::IgnoreDecision; |
| 5 | 5 | |
| 6 | 6 | const EXTRA_ARCHS: &[&str] = &["spirv"]; |
| @@ -222,7 +222,7 @@ pub(super) fn parse_cfg_name_directive<'a>( | ||
| 222 | 222 | name: format!("mode-{}", config.mode.to_str()), |
| 223 | 223 | allowed_names: ContainsPrefixed { |
| 224 | 224 | prefix: "mode-", |
| 225 | - inner: Mode::STR_VARIANTS, | |
| 225 | + inner: ["coverage-run", "coverage-map"], | |
| 226 | 226 | }, |
| 227 | 227 | message: "when the test mode is {name}", |
| 228 | 228 | } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | use std::io::Read; |
| 2 | 2 | use std::path::Path; |
| 3 | -use std::str::FromStr; | |
| 4 | 3 | |
| 5 | 4 | use super::iter_header; |
| 6 | 5 | use crate::common::{Config, Debugger, Mode}; |
| @@ -574,14 +573,12 @@ fn families() { | ||
| 574 | 573 | |
| 575 | 574 | #[test] |
| 576 | 575 | fn ignore_mode() { |
| 577 | -for &mode in Mode::STR_VARIANTS { | |
| 576 | +for mode in ["coverage-map", "coverage-run"] { | |
| 578 | 577 | // Indicate profiler support so that "coverage-run" tests aren't skipped. |
| 579 | 578 | let config: Config = cfg().mode(mode).profiler_support(true).build(); |
| 580 | 579 | let other = if mode == "coverage-run" { "coverage-map" } else { "coverage-run" }; |
| 581 | 580 | |
| 582 | 581 | assert_ne!(mode, other); |
| 583 | -assert_eq!(config.mode, Mode::from_str(mode).unwrap()); | |
| 584 | -assert_ne!(config.mode, Mode::from_str(other).unwrap()); | |
| 585 | 582 | |
| 586 | 583 | assert!(check_ignore(&config, &format!("//@ ignore-mode-{mode}"))); |
| 587 | 584 | assert!(!check_ignore(&config, &format!("//@ ignore-mode-{other}"))); |