Skip to content

Commit 00bf266

Browse files
authored
Unrolled build for rust-lang#138858
Rollup merge of rust-lang#138858 - jieyouxu:ct-llvm-components, r=onur-ozkan Say which test failed the `COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS` assertion Closes rust-lang#138857. This is of course a spot fix. The general problem requires reworking compiletest directive handling's diagnostics logic.
2 parents aa8f0fd + f10b587 commit 00bf266

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/tools/compiletest/src/header.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ pub fn make_test_description<R: Read>(
13851385
decision!(cfg::handle_ignore(config, ln));
13861386
decision!(cfg::handle_only(config, ln));
13871387
decision!(needs::handle_needs(&cache.needs, config, ln));
1388-
decision!(ignore_llvm(config, ln));
1388+
decision!(ignore_llvm(config, path, ln));
13891389
decision!(ignore_cdb(config, ln));
13901390
decision!(ignore_gdb(config, ln));
13911391
decision!(ignore_lldb(config, ln));
@@ -1525,7 +1525,7 @@ fn ignore_lldb(config: &Config, line: &str) -> IgnoreDecision {
15251525
IgnoreDecision::Continue
15261526
}
15271527

1528-
fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
1528+
fn ignore_llvm(config: &Config, path: &Path, line: &str) -> IgnoreDecision {
15291529
if let Some(needed_components) =
15301530
config.parse_name_value_directive(line, "needs-llvm-components")
15311531
{
@@ -1536,8 +1536,9 @@ fn ignore_llvm(config: &Config, line: &str) -> IgnoreDecision {
15361536
{
15371537
if env::var_os("COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS").is_some() {
15381538
panic!(
1539-
"missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set",
1540-
missing_component
1539+
"missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set: {}",
1540+
missing_component,
1541+
path.display()
15411542
);
15421543
}
15431544
return IgnoreDecision::Ignore {

0 commit comments

Comments
 (0)