diff options
| author | bors <bors@rust-lang.org> | 2024-05-30 21:51:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-05-30 21:51:24 +0000 |
| commit | 434999efe6e9aa61afbd8b4ae86864d3ce91c533 (patch) | |
| tree | 657fcebdf39c8dde77f2dbae22ea2984ab44830d /src/tools/compiletest | |
| parent | 6f3df08aadf71e8d4bf7e49f5dc10dfa6f254cb4 (diff) | |
| parent | 4ce7e094ae9d226535a404075efc92898f79793a (diff) | |
| download | rust-434999efe6e9aa61afbd8b4ae86864d3ce91c533.tar.gz rust-434999efe6e9aa61afbd8b4ae86864d3ce91c533.zip | |
Auto merge of #125710 - RalfJung:compiletest-components, r=workingjubilee
compiletest: clarify COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS error COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS is a confusing name because elsewhere "needs" means "ignore when requirement not met", but here it means "fail when requirement not met".
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index dc5818201b6..a2cdf800a97 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1436,7 +1436,7 @@ pub fn make_test_description<R: Read>( if config.target == "wasm32-unknown-unknown" { if config.parse_name_directive(ln, directives::CHECK_RUN_RESULTS) { decision!(IgnoreDecision::Ignore { - reason: "ignored when checking the run results on WASM".into(), + reason: "ignored on WASM as the run results cannot be checked there".into(), }); } } @@ -1577,8 +1577,11 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision { .split_whitespace() .find(|needed_component| !components.contains(needed_component)) { - if env::var_os("COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS").is_some() { - panic!("missing LLVM component: {}", missing_component); + if env::var_os("COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS").is_some() { + panic!( + "missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set", + missing_component + ); } return IgnoreDecision::Ignore { reason: format!("ignored when the {missing_component} LLVM component is missing"), |