diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-03-13 20:01:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 20:01:54 +0100 |
| commit | fa98724d0266ca822b66c1c219bd07c65beff236 (patch) | |
| tree | 0d56117e729d2bd363a3fba596c5b7230c8ab155 | |
| parent | 3cbb93223f33024db464a4df27a13c7cce870173 (diff) | |
| parent | 8f21da1df333bdef7024266f6181ea7891bd3bea (diff) | |
| download | rust-fa98724d0266ca822b66c1c219bd07c65beff236.tar.gz rust-fa98724d0266ca822b66c1c219bd07c65beff236.zip | |
Rollup merge of #122422 - Enselic:only-unix, r=oli-obk
compiletest: Allow `only-unix` in test headers The header `ignore-unix` is already allowed. Also extend tests. This is needed by https://github.com/rust-lang/rust/pull/121573 which I am splitting up into smaller and more digestible PRs.
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header/tests.rs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 69658222ff3..a512599f723 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -852,6 +852,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "only-sparc64", "only-stable", "only-thumb", + "only-unix", "only-wasm32", "only-wasm32-bare", "only-windows", diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index 433f3e8b555..cf300fbe74f 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -285,6 +285,7 @@ fn ignore_target() { assert!(check_ignore(&config, "//@ ignore-x86_64-unknown-linux-gnu")); assert!(check_ignore(&config, "//@ ignore-x86_64")); assert!(check_ignore(&config, "//@ ignore-linux")); + assert!(check_ignore(&config, "//@ ignore-unix")); assert!(check_ignore(&config, "//@ ignore-gnu")); assert!(check_ignore(&config, "//@ ignore-64bit")); @@ -300,6 +301,7 @@ fn only_target() { assert!(check_ignore(&config, "//@ only-x86")); assert!(check_ignore(&config, "//@ only-linux")); + assert!(check_ignore(&config, "//@ only-unix")); assert!(check_ignore(&config, "//@ only-msvc")); assert!(check_ignore(&config, "//@ only-32bit")); |