bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Address review

Browse source
This commit is contained in:
Kirill Podoprigora 2024-11-13 15:31:07 +02:00
parent 98a71766b8
commit 81f6105851
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tools/compiletest/src/header.rs
View file

@ -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: <version>"
// Syntax is "exact-llvm-major-version: <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
),
};

6
src/tools/compiletest/src/header/tests.rs
View file

@ -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]