diff options
| author | Michael Goulet <michael@errs.io> | 2025-03-23 14:59:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-23 14:59:35 -0400 |
| commit | db52a4a03088a1b094723fc4fcb2176fcd4c19f2 (patch) | |
| tree | 4962551af3c01a46e214044d5c80ee17f80b9c64 /src | |
| parent | 1e023420f9ae58cb7b6c51055fb2274893117c63 (diff) | |
| parent | f10b58714e864ac7c1f6d6ac1666f26d4a1ca955 (diff) | |
| download | rust-db52a4a03088a1b094723fc4fcb2176fcd4c19f2.tar.gz rust-db52a4a03088a1b094723fc4fcb2176fcd4c19f2.zip | |
Rollup merge of #138858 - jieyouxu:ct-llvm-components, r=onur-ozkan
Say which test failed the `COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS` assertion Closes #138857. This is of course a spot fix. The general problem requires reworking compiletest directive handling's diagnostics logic.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/compiletest/src/header.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/compiletest/src/header.rs b/src/tools/compiletest/src/header.rs index 7675e13990d..d7a5f304d23 100644 --- a/src/tools/compiletest/src/header.rs +++ b/src/tools/compiletest/src/header.rs @@ -1385,7 +1385,7 @@ pub fn make_test_description<R: Read>( decision!(cfg::handle_ignore(config, ln)); decision!(cfg::handle_only(config, ln)); decision!(needs::handle_needs(&cache.needs, config, ln)); - decision!(ignore_llvm(config, ln)); + decision!(ignore_llvm(config, path, ln)); decision!(ignore_cdb(config, ln)); decision!(ignore_gdb(config, ln)); decision!(ignore_lldb(config, ln)); @@ -1525,7 +1525,7 @@ fn ignore_lldb(config: &Config, line: &str) -> IgnoreDecision { IgnoreDecision::Continue } -fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision { +fn ignore_llvm(config: &Config, path: &Path, line: &str) -> IgnoreDecision { if let Some(needed_components) = config.parse_name_value_directive(line, "needs-llvm-components") { @@ -1536,8 +1536,9 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision { { 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 + "missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set: {}", + missing_component, + path.display() ); } return IgnoreDecision::Ignore { |