File tree 3 files changed +24
-0
lines changed
src/tools/compiletest/src
3 files changed +24
-0
lines changed Original file line number Diff line number Diff line change @@ -117,6 +117,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
117
117
"incremental" ,
118
118
"known-bug" ,
119
119
"llvm-cov-flags" ,
120
+ "max-llvm-major-version" ,
120
121
"min-cdb-version" ,
121
122
"min-gdb-version" ,
122
123
"min-lldb-version" ,
Original file line number Diff line number Diff line change @@ -1546,6 +1546,20 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
1546
1546
) ,
1547
1547
} ;
1548
1548
}
1549
+ } else if let Some ( version_string) =
1550
+ config. parse_name_value_directive ( line, "max-llvm-major-version" )
1551
+ {
1552
+ let max_version = extract_llvm_version ( & version_string) ;
1553
+ // Ignore if actual major version is larger than the maximum required major version.
1554
+ if actual_version. major > max_version. major {
1555
+ return IgnoreDecision :: Ignore {
1556
+ reason : format ! (
1557
+ "ignored when the LLVM version ({actual_version}) is newer than major\
1558
+ version {}",
1559
+ max_version. major
1560
+ ) ,
1561
+ } ;
1562
+ }
1549
1563
} else if let Some ( version_string) =
1550
1564
config. parse_name_value_directive ( line, "min-system-llvm-version" )
1551
1565
{
Original file line number Diff line number Diff line change @@ -266,6 +266,15 @@ fn llvm_version() {
266
266
267
267
let config: Config = cfg ( ) . llvm_version ( "10.0.0" ) . build ( ) ;
268
268
assert ! ( !check_ignore( & config, "//@ min-llvm-version: 9.0" ) ) ;
269
+
270
+ let config: Config = cfg ( ) . llvm_version ( "19.0.0" ) . build ( ) ;
271
+ assert ! ( !check_ignore( & config, "//@ max-llvm-major-version: 19" ) ) ;
272
+
273
+ let config: Config = cfg ( ) . llvm_version ( "19.1.2" ) . build ( ) ;
274
+ assert ! ( !check_ignore( & config, "//@ max-llvm-major-version: 19" ) ) ;
275
+
276
+ let config: Config = cfg ( ) . llvm_version ( "20.0.0" ) . build ( ) ;
277
+ assert ! ( check_ignore( & config, "//@ max-llvm-major-version: 19" ) ) ;
269
278
}
270
279
271
280
#[ test]
You can’t perform that action at this time.
0 commit comments