Say which test failed the COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS
assertion
This commit is contained in:
parent
60a3084f64
commit
f10b58714e
1 changed files with 5 additions and 4 deletions
|
@ -1385,7 +1385,7 @@ pub fn make_test_description<R: Read>(
|
||||||
decision!(cfg::handle_ignore(config, ln));
|
decision!(cfg::handle_ignore(config, ln));
|
||||||
decision!(cfg::handle_only(config, ln));
|
decision!(cfg::handle_only(config, ln));
|
||||||
decision!(needs::handle_needs(&cache.needs, 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_cdb(config, ln));
|
||||||
decision!(ignore_gdb(config, ln));
|
decision!(ignore_gdb(config, ln));
|
||||||
decision!(ignore_lldb(config, ln));
|
decision!(ignore_lldb(config, ln));
|
||||||
|
@ -1525,7 +1525,7 @@ fn ignore_lldb(config: &Config, line: &str) -> IgnoreDecision {
|
||||||
IgnoreDecision::Continue
|
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) =
|
if let Some(needed_components) =
|
||||||
config.parse_name_value_directive(line, "needs-llvm-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() {
|
if env::var_os("COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS").is_some() {
|
||||||
panic!(
|
panic!(
|
||||||
"missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set",
|
"missing LLVM component {}, and COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS is set: {}",
|
||||||
missing_component
|
missing_component,
|
||||||
|
path.display()
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return IgnoreDecision::Ignore {
|
return IgnoreDecision::Ignore {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue