File tree Expand file tree Collapse file tree 2 files changed +7
-4
lines changed
Expand file tree Collapse file tree 2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 172172# Unless we're using an older version of LLVM, check that all LLVM components
173173# used by tests are available.
174174if [ " $IS_NOT_LATEST_LLVM " = " " ]; then
175- export COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS =1
175+ export COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS =1
176176fi
177177
178178if [ " $ENABLE_GCC_CODEGEN " = " 1" ]; then
Original file line number Diff line number Diff line change @@ -1436,7 +1436,7 @@ pub fn make_test_description<R: Read>(
14361436 if config. target == "wasm32-unknown-unknown" {
14371437 if config. parse_name_directive ( ln, directives:: CHECK_RUN_RESULTS ) {
14381438 decision ! ( IgnoreDecision :: Ignore {
1439- reason: "ignored when checking the run results on WASM " . into( ) ,
1439+ reason: "ignored on WASM as the run results cannot be checked there " . into( ) ,
14401440 } ) ;
14411441 }
14421442 }
@@ -1577,8 +1577,11 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
15771577 . split_whitespace ( )
15781578 . find ( |needed_component| !components. contains ( needed_component) )
15791579 {
1580- if env:: var_os ( "COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS" ) . is_some ( ) {
1581- panic ! ( "missing LLVM component: {}" , missing_component) ;
1580+ if env:: var_os ( "COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS" ) . is_some ( ) {
1581+ panic ! (
1582+ "missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set" ,
1583+ missing_component
1584+ ) ;
15821585 }
15831586 return IgnoreDecision :: Ignore {
15841587 reason : format ! ( "ignored when the {missing_component} LLVM component is missing" ) ,
You can’t perform that action at this time.
0 commit comments