From 81f61058519a408ca8d55e87435f092cc967de8b Mon Sep 17 00:00:00 2001 From: Kirill Podoprigora Date: Wed, 13 Nov 2024 15:31:07 +0200 Subject: [PATCH] Address review --- src/tools/compiletest/src/header.rs | 6 +++--- src/tools/compiletest/src/header/tests.rs | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 5b198c3e60b24..0e81f675474aa 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1588,12 +1588,12 @@ 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: " + // Syntax is "exact-llvm-major-version: " let version = extract_llvm_version(&version_string); - if actual_version.major > version.major || actual_version.major < version.major { + if actual_version.major != version.major { return IgnoreDecision::Ignore { reason: format!( - "ignored when the LLVM major version is {}, but it should be {}", + "ignored when the actual LLVM major version is {}, but the test only targets major version {}", actual_version.major, version.major ), }; diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs index 1eca48c1c3a83..6c52a1b950782 100644 --- a/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs @@ -293,6 +293,12 @@ fn llvm_version() { let config: Config = cfg().llvm_version("10.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")); + + let config: Config = cfg().llvm_version("10.6.2").build(); + assert!(!check_ignore(&config, "//@ exact-llvm-major-version: 10")); } #[test]