run-make: Delete cat-and-grep-sanity-check and restrict branch-protection-check-IBT to stable
#129156
+5
−79
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
A-run-make
|
This PR modifies cc @jieyouxu |
|
@bors delegate+ (try jobs) |
|
✌️ @Oneirical, you can now approve this pull request! If @jieyouxu told you to " |
|
@bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 16, 2024
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
This comment has been minimized.
This comment has been minimized.
Oneirical
force-pushed
the
final-curtest-call
branch
from
41cd029
to
d85d292
Compare
rustbot
added
A-testsuite
|
@bors try- (feature request: this should be called bors give up) |
|
@bors try |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 16, 2024
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
|
The job Click to see the possible cause of the failure (guessed by this bot) |
fbstj
reviewed
Aug 16, 2024
|
The job Click to see the possible cause of the failure (guessed by this bot) |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-author
jieyouxu
reviewed
Aug 21, 2024
| @@ -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 | |||
There was a problem hiding this comment.
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 |
Comment on lines
-14
to
+16
| let llvm_components = env_var("LLVM_COMPONENTS"); | ||
| if !format!(" {llvm_components} ").contains(" x86 ") { | ||
| return; | ||
| } | ||
| // if !llvm_components_contain("x86") { | ||
| // panic!(); | ||
| // } |
There was a problem hiding this comment.
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.
jieyouxu
added
S-waiting-on-review
|
cc @bjorn3 do you have any idea if AFAICT (at least on nightly/master), on a $ rustc \
--target=x86_64-linux-unknown-gnu \
-Z cf-protection=branch \
-C link-args='-nostartfiles' \
hello_world.rs \
-o hello_world
$ llvm-readelf -nW hello_worldonly has build-id, not Update: may need |
|
As nikic suggested, I was able to repro the note via $ RUSTFLAGS="-Z cf-protection=branch" cargo +nightly build -Z build-std --target=x86_64-unknown-linux-gnuso we probably want to use bootstrap cargo like in some other tests (yes I know this will require internet connection and is probably not ideal). |
jieyouxu
added
S-waiting-on-author
Not all that familiar with this, but I would IBT to only be enabled for the process if |
alex-semenyuk
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #131387) made this pull request unmergeable. Please resolve the merge conflicts. |
|
@Oneirical any updates on this? thanks |
|
@rustbot review (I need to look at it again) |
rustbot
added
S-waiting-on-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #121876 and the associated Google Summer of Code project.
First, this PR deletes the now useless
cat-and-grep-sanity-checktest.Second, it revisits the
branch-protection-check-IBTtest, which was disabled due to a nonsensicalllvm_componentscheck. #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