diff options
| author | Kirill Podoprigora <kirill.bast9@mail.ru> | 2024-11-13 15:05:31 +0200 |
|---|---|---|
| committer | Kirill Podoprigora <kirill.bast9@mail.ru> | 2024-11-13 15:05:31 +0200 |
| commit | 98a71766b8b6ece6fabb8429e5fe53805ba28b78 (patch) | |
| tree | 295006f400a1a079f30840a8d53ad4e3df516e01 | |
| parent | 44f233f2519ce5d633c87c38014d03d8a5f0e810 (diff) | |
| download | rust-98a71766b8b6ece6fabb8429e5fe53805ba28b78.tar.gz rust-98a71766b8b6ece6fabb8429e5fe53805ba28b78.zip | |
Add ``exact-llvm-major-version`` directive
| -rw-r--r-- | src/tools/compiletest/src/directive-list.rs | 1 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 13 | ||||
| -rw-r--r-- | src/tools/compiletest/src/header/tests.rs | 9 | ||||
| -rw-r--r-- | tests/codegen/try_question_mark_nop.rs | 3 |
4 files changed, 24 insertions, 2 deletions
diff --git a/src/tools/compiletest/src/directive-list.rs b/src/tools/compiletest/src/directive-list.rs index 4a102f0c2cb..038de9036bf 100644 --- a/src/tools/compiletest/src/directive-list.rs +++ b/src/tools/compiletest/src/directive-list.rs @@ -25,6 +25,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ "dont-check-failure-status", "edition", "error-pattern", + "exact-llvm-major-version", "exec-env", "failure-status", "filecheck-flags", diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 300a03e5f33..5b198c3e60b 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1585,6 +1585,19 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision { }; } } + } else if let Some(version_string) = + config.parse_name_value_directive(line, "exact-llvm-major-version") + { + // Syntax is "only-llvm-major-version: <version>" + let version = extract_llvm_version(&version_string); + if actual_version.major > version.major || actual_version.major < version.major { + return IgnoreDecision::Ignore { + reason: format!( + "ignored when the LLVM major version is {}, but it should be {}", + actual_version.major, version.major + ), + }; + } } } IgnoreDecision::Continue diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index c3fb8d4ab80..1eca48c1c3a 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -284,6 +284,15 @@ fn llvm_version() { let config: Config = cfg().llvm_version("10.0.0").build(); assert!(!check_ignore(&config, "//@ min-llvm-version: 9.0")); + + let config: Config = cfg().llvm_version("10.0.0").build(); + assert!(check_ignore(&config, "//@ exact-llvm-major-version: 9.0")); + + let config: Config = cfg().llvm_version("9.0.0").build(); + assert!(check_ignore(&config, "//@ exact-llvm-major-version: 10.0")); + + let config: Config = cfg().llvm_version("10.0.0").build(); + assert!(!check_ignore(&config, "//@ exact-llvm-major-version: 10.0")); } #[test] diff --git a/tests/codegen/try_question_mark_nop.rs b/tests/codegen/try_question_mark_nop.rs index b68ecce869e..36a0d9066c8 100644 --- a/tests/codegen/try_question_mark_nop.rs +++ b/tests/codegen/try_question_mark_nop.rs @@ -2,8 +2,7 @@ //@ only-x86_64 // FIXME: Remove the `min-llvm-version`. //@ revisions: NINETEEN TWENTY -//@[NINETEEN] min-llvm-version: 19 -//@[NINETEEN] ignore-llvm-version: 20-99 +//@[NINETEEN] exact-llvm-major-version: 19 //@[TWENTY] min-llvm-version: 20 //@ min-llvm-version: 19 |