Skip to content

Commit 23e7ecb

Browse files
committed
Auto merge of #125949 - erikdesjardins:nocomponent, r=jieyouxu
Revert "tidy: validate LLVM component names in tests" This reverts #125472. This has already caused a [bit](#125702) of [trouble](#125710), and I was mistaken about the original motivation--incorrect component names [_will_](#125702 (comment)) be detected by a full CI run. I no longer think it pulls its weight. r? `@workingjubilee`
2 parents 1e0df74 + 040929b commit 23e7ecb

File tree

1 file changed

+0
-34
lines changed

1 file changed

+0
-34
lines changed

src/tools/tidy/src/target_specific_tests.rs

-34
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,6 @@ use crate::walk::filter_not_rust;
1010
const LLVM_COMPONENTS_HEADER: &str = "needs-llvm-components:";
1111
const COMPILE_FLAGS_HEADER: &str = "compile-flags:";
1212

13-
const KNOWN_LLVM_COMPONENTS: &[&str] = &[
14-
"aarch64",
15-
"arm",
16-
"avr",
17-
"bpf",
18-
"csky",
19-
"hexagon",
20-
"loongarch",
21-
"m68k",
22-
"mips",
23-
"msp430",
24-
"nvptx",
25-
"powerpc",
26-
"riscv",
27-
"sparc",
28-
"systemz",
29-
"webassembly",
30-
"x86",
31-
];
32-
3313
#[derive(Default, Debug)]
3414
struct RevisionInfo<'a> {
3515
target_arch: Option<&'a str>,
@@ -94,20 +74,6 @@ pub fn check(tests_path: &Path, bad: &mut bool) {
9474
// gathered.
9575
}
9676
}
97-
if let Some(llvm_components) = llvm_components {
98-
for component in llvm_components {
99-
// Ensure the given component even exists.
100-
// This is somewhat redundant with COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS,
101-
// but helps detect such problems earlier (PR CI rather than bors CI).
102-
if !KNOWN_LLVM_COMPONENTS.contains(component) {
103-
eprintln!(
104-
"{}: revision {} specifies unknown LLVM component `{}`",
105-
file, rev, component
106-
);
107-
*bad = true;
108-
}
109-
}
110-
}
11177
}
11278
});
11379
}

0 commit comments

Comments
 (0)