Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2b85d0b

Browse files
committedAug 16, 2024
Auto merge of rust-lang#129156 - Oneirical:final-curtest-call, r=<try>
run-make: Delete `cat-and-grep-sanity-check` and restrict `branch-protection-check-IBT` to stable Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html). First, this PR deletes the now useless `cat-and-grep-sanity-check` test. Second, it revisits the `branch-protection-check-IBT` test, which was disabled due to a nonsensical `llvm_components` check. rust-lang#126720 states that the test does work on stable rustc, so let's check this: added `//@ only-stable`. If this works, some of the FIXME and commented-out lines will need cleanup before merging. Please try: try-job: x86_64-gnu-stable
2 parents 27b93da + 41cd029 commit 2b85d0b

File tree

3 files changed

+5
-77
lines changed

3 files changed

+5
-77
lines changed
 

‎tests/run-make/branch-protection-check-IBT/Makefile

-21
This file was deleted.

‎tests/run-make/branch-protection-check-IBT/_rmake.rs ‎tests/run-make/branch-protection-check-IBT/rmake.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@
44
// python3 x.py test --target x86_64-unknown-linux-gnu tests/run-make/branch-protection-check-IBT/
55

66
//@ only-x86_64
7+
//@ only-stable
78

8-
//@ ignore-test
99
// FIXME(jieyouxu): see the FIXME in the Makefile
1010

11-
use run_make_support::{cwd, env_var, llvm_readobj, rustc};
11+
use run_make_support::{cwd, llvm_components_contain, llvm_readobj, rustc};
1212

1313
fn main() {
14-
let llvm_components = env_var("LLVM_COMPONENTS");
15-
if !format!(" {llvm_components} ").contains(" x86 ") {
16-
return;
17-
}
14+
// if !llvm_components_contain("x86") {
15+
// panic!();
16+
// }
1817

1918
rustc()
2019
.input("main.rs")

‎tests/run-make/cat-and-grep-sanity-check/Makefile

-50
This file was deleted.

0 commit comments

Comments
 (0)
Failed to load comments.