Skip to content

Commit

Permalink
Auto merge of rust-lang#129156 - Oneirical:final-curtest-call, r=<try>
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Aug 16, 2024
2 parents 27b93da + d85d292 commit 2f217ea
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 79 deletions.
2 changes: 0 additions & 2 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
run-make/branch-protection-check-IBT/Makefile
run-make/cat-and-grep-sanity-check/Makefile
run-make/emit-to-stdout/Makefile
run-make/extern-fn-reachable/Makefile
run-make/incr-add-rust-src-component/Makefile
Expand Down
21 changes: 0 additions & 21 deletions tests/run-make/branch-protection-check-IBT/Makefile

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,16 @@
// python3 x.py test --target x86_64-unknown-linux-gnu tests/run-make/branch-protection-check-IBT/

//@ only-x86_64
//@ only-stable

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

use run_make_support::{cwd, env_var, llvm_readobj, rustc};
use run_make_support::{cwd, llvm_components_contain, llvm_readobj, rustc};

fn main() {
let llvm_components = env_var("LLVM_COMPONENTS");
if !format!(" {llvm_components} ").contains(" x86 ") {
return;
}
// if !llvm_components_contain("x86") {
// panic!();
// }

rustc()
.input("main.rs")
Expand Down
50 changes: 0 additions & 50 deletions tests/run-make/cat-and-grep-sanity-check/Makefile

This file was deleted.

0 comments on commit 2f217ea

Please sign in to comment.