diff options
| author | Ralf Jung <post@ralfj.de> | 2024-05-29 11:33:13 +0200 |
|---|---|---|
| committer | Ralf Jung <post@ralfj.de> | 2024-05-30 08:07:56 +0200 |
| commit | 4ce7e094ae9d226535a404075efc92898f79793a (patch) | |
| tree | 2417b2e2cbd93782bffb40cc2cf2f360370d97b2 /src/tools/compiletest | |
| parent | caa187f3bc9604c78dfbc3ffabbe1372cb528639 (diff) | |
| download | rust-4ce7e094ae9d226535a404075efc92898f79793a.tar.gz rust-4ce7e094ae9d226535a404075efc92898f79793a.zip | |
compiletest: clarify COMPILETEST_NEEDS_ALL_LLVM_COMPONENTS error
also improve wording for an ignore reason
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"), |