Skip to content

Commit

Permalink
Auto merge of rust-lang#125949 - erikdesjardins:nocomponent, r=jieyouxu
Browse files Browse the repository at this point in the history
Revert "tidy: validate LLVM component names in tests"

This reverts rust-lang#125472.

This has already caused a [bit](rust-lang#125702) of [trouble](rust-lang#125710), and I was mistaken about the original motivation--incorrect component names [_will_](rust-lang#125702 (comment)) be detected by a full CI run.

I no longer think it pulls its weight.

r? `@workingjubilee`
  • Loading branch information
bors committed Nov 17, 2024
2 parents 1e0df74 + 040929b commit 23e7ecb
Showing 1 changed file with 0 additions and 34 deletions.
34 changes: 0 additions & 34 deletions src/tools/tidy/src/target_specific_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,6 @@ use crate::walk::filter_not_rust;
const LLVM_COMPONENTS_HEADER: &str = "needs-llvm-components:";
const COMPILE_FLAGS_HEADER: &str = "compile-flags:";

const KNOWN_LLVM_COMPONENTS: &[&str] = &[
"aarch64",
"arm",
"avr",
"bpf",
"csky",
"hexagon",
"loongarch",
"m68k",
"mips",
"msp430",
"nvptx",
"powerpc",
"riscv",
"sparc",
"systemz",
"webassembly",
"x86",
];

#[derive(Default, Debug)]
struct RevisionInfo<'a> {
target_arch: Option<&'a str>,
Expand Down Expand Up @@ -94,20 +74,6 @@ pub fn check(tests_path: &Path, bad: &mut bool) {
// gathered.
}
}
if let Some(llvm_components) = llvm_components {
for component in llvm_components {
// Ensure the given component even exists.
// This is somewhat redundant with COMPILETEST_REQUIRE_ALL_LLVM_COMPONENTS,
// but helps detect such problems earlier (PR CI rather than bors CI).
if !KNOWN_LLVM_COMPONENTS.contains(component) {
eprintln!(
"{}: revision {} specifies unknown LLVM component `{}`",
file, rev, component
);
*bad = true;
}
}
}
}
});
}

0 comments on commit 23e7ecb

Please sign in to comment.