Add needs-unwind compiletest directive to libtest-thread-limit and replace some Path with path in run-make#129690
Merged
bors merged 2 commits intorust-lang:masterfrom Aug 29, 2024
Merged
Conversation
Collaborator
rustbot
added
A-run-make
Collaborator
|
This PR modifies cc @jieyouxu |
Oneirical
changed the title
needs-unwind compiletest directive to libtest-thread-limit and replace some Path with pathneeds-unwind compiletest directive to libtest-thread-limit and replace some Path with path in run-make
This comment has been minimized.
This comment has been minimized.
Oneirical
force-pushed
the
run-make-tidbits
branch
from
bb4c81a to
115f6d2
Compare
Collaborator
|
☔ The latest upstream changes (presumably #129691) made this pull request unmergeable. Please resolve the merge conflicts. |
Member
|
Thanks, r=me after a rebase |
Member
|
@bors delegate+ rollup |
Collaborator
|
✌️ @Oneirical, you can now approve this pull request! If @jieyouxu told you to " |
jieyouxu
approved these changes
Aug 29, 2024
jieyouxu
added
S-waiting-on-author
Oneirical
force-pushed
the
run-make-tidbits
branch
from
115f6d2 to
65cb5de
Compare
Contributor
Author
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 29, 2024
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#123940 (debug-fmt-detail option) - rust-lang#128166 (Improved `checked_isqrt` and `isqrt` methods) - rust-lang#128970 (Add `-Zlint-llvm-ir`) - rust-lang#129316 (riscv64imac: allow shadow call stack sanitizer) - rust-lang#129690 (Add `needs-unwind` compiletest directive to `libtest-thread-limit` and replace some `Path` with `path` in `run-make`) - rust-lang#129732 (Add `unreachable_pub`, round 3) - rust-lang#129743 (Fix rustdoc clippy lints) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 29, 2024
…llaumeGomez Rollup of 7 pull requests Successful merges: - rust-lang#123940 (debug-fmt-detail option) - rust-lang#128166 (Improved `checked_isqrt` and `isqrt` methods) - rust-lang#128970 (Add `-Zlint-llvm-ir`) - rust-lang#129316 (riscv64imac: allow shadow call stack sanitizer) - rust-lang#129690 (Add `needs-unwind` compiletest directive to `libtest-thread-limit` and replace some `Path` with `path` in `run-make`) - rust-lang#129732 (Add `unreachable_pub`, round 3) - rust-lang#129743 (Fix rustdoc clippy lints) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 29, 2024
Rollup merge of rust-lang#129690 - Oneirical:run-make-tidbits, r=jieyouxu Add `needs-unwind` compiletest directive to `libtest-thread-limit` and replace some `Path` with `path` in `run-make` 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). This PR does two things: 1. Add this to `libtest-thread-limit` ([Why?](rust-lang#128507 (comment))) ``` //@ needs-unwind // Reason: this should be ignored in cg_clif (Cranelift) CI and anywhere // else that uses panic=abort. ``` 2. Use `path` instead of `Path` to simplify multiple run-make tests.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This PR does two things:
libtest-thread-limit(Why?)pathinstead ofPathto simplify multiple run-make tests.