Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

run-make: Delete cat-and-grep-sanity-check and restrict branch-protection-check-IBT to stable #129156

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −79
Open

run-make: Delete cat-and-grep-sanity-check and restrict branch-protection-check-IBT to stable #129156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78272ae
restrict branch-protection-check-IBT run-make test to stable
Oneirical Aug 16, 2024
d85d292
remove cat-and-grep-sanity-check run-make test
Oneirical Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
View file
Open in desktop
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
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions ...ake/branch-protection-check-IBT/_rmake.rs → ...make/branch-protection-check-IBT/rmake.rs
View file
Open in desktop
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
Copy link
Member

@jieyouxu jieyouxu Aug 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Problem: this can't be correct, it's been in stable since forever, and I don't see any changes that would cause this to not be emitted (yet).


//@ ignore-test
// FIXME(jieyouxu): see the FIXME in the Makefile
jieyouxu marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remark (for myself): FIXME


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!();
// }
Comment on lines -14 to +16
Copy link
Member

@jieyouxu jieyouxu Aug 21, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussion (self-remark mostly): it's not entirely clear to me why we need to check for llvm-components.

EDIT: because if we want to run target-specific codegen, it will need the llvm component. Right.


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

This file was deleted.

Loading