Skip to content

make UI tests that use --test work on panic=abort targets #135823

New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Jan 22, 2025
Merged

make UI tests that use --test work on panic=abort targets #135823

merged 1 commit into from
Jan 22, 2025

Conversation

japaric
Copy link
Member

@japaric japaric commented Jan 21, 2025 •
edited by jieyouxu
Loading

By passing -Zpanic_abort_test.

fixes #135819

@rustbot
Copy link
Collaborator

rustbot commented Jan 21, 2025

r? @SparrowLii

rustbot has assigned @SparrowLii.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 21, 2025
jieyouxu
jieyouxu approved these changes Jan 21, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

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

Thanks, I'll r+ after PR CI is green.

@jieyouxu
Copy link
Member

r? jieyouxu

@rustbot rustbot assigned jieyouxu and unassigned SparrowLii Jan 21, 2025
@jieyouxu
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 21, 2025

📌 Commit 8722427 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 21, 2025
bjorn3
bjorn3 reviewed Jan 21, 2025
View reviewed changes
...rfc-2011-nicer-assert-messages/assert-with-custom-errors-does-not-create-unnecessary-code.rs Outdated
//@ [can_unwind] needs-unwind
//
//@ revisions: cannot_unwind
//@ [cannot_unwind] compile-flags: --test -Zpanic_abort_tests
Copy link
Member

Choose a reason for hiding this comment

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

I think -Zpanic-abort-tests does nothing for -Cpanic=unwind so enabling it unconditionally should be fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

indeed, that works. updated the PR

@jieyouxu
Copy link
Member

@bors r- (one nit)

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 21, 2025
@japaric
make UI tests that use --test work on panic=abort targets
ece8b0c 
by adding `-Zpanic_abort_test`, which is a no-op on panic=unwind targets

fixes rust-lang#135819
@japaric
Copy link
Member Author

japaric commented Jan 21, 2025

simplified the directives as per the inline suggestion

@jieyouxu
Copy link
Member

Thanks!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 22, 2025

📌 Commit ece8b0c has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 22, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jan 22, 2025
@jieyouxu
Rollup merge of rust-lang#135823 - ferrocene:ja-gh135819, r=jieyouxu
dc42150 
make UI tests that use `--test` work on panic=abort targets

By passing `-Zpanic_abort_test`.

fixes rust-lang#135819
@jieyouxu jieyouxu mentioned this pull request Jan 22, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2025
@bors
Auto merge of rust-lang#135861 - jieyouxu:rollup-d4naa6s, r=jieyouxu
4dac61d 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#135779 (CI: free disk on linux arm runner)
 - rust-lang#135794 (Detect missing fields with default values and suggest `..`)
 - rust-lang#135814 (ci: use ghcr buildkit image)
 - rust-lang#135818 (tests: Port `translation` to rmake.rs)
 - rust-lang#135823 (make UI tests that use `--test` work on panic=abort targets)
 - rust-lang#135837 (Remove test panic from File::open)
 - rust-lang#135852 (Add `AsyncFn*` to `core` prelude)
 - rust-lang#135856 (Library: Finalize dyn compatibility renaming)

r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jan 22, 2025
@jieyouxu
Rollup merge of rust-lang#135823 - ferrocene:ja-gh135819, r=jieyouxu
128e9d2 
make UI tests that use `--test` work on panic=abort targets

By passing `-Zpanic_abort_test`.

fixes rust-lang#135819
@jieyouxu jieyouxu mentioned this pull request Jan 22, 2025
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jan 22, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2025
@bors
Auto merge of rust-lang#135893 - matthiaskrgr:rollup-2qqo647, r=matth…
649b995 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#133372 (Refactor dyn-compatibility error and suggestions)
 - rust-lang#134396 (AIX: use align 8 for byval parameter)
 - rust-lang#135156 (Make our `DIFlags` match `LLVMDIFlags` in the LLVM-C API)
 - rust-lang#135816 (Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors)
 - rust-lang#135823 (make UI tests that use `--test` work on panic=abort targets)
 - rust-lang#135850 (Update the `wasm-component-ld` tool)
 - rust-lang#135858 (rustdoc: Finalize dyn compatibility renaming)
 - rust-lang#135866 (Don't pick `T: FnPtr` nested goals as the leaf goal in diagnostics for new solver)
 - rust-lang#135874 (Enforce that all spans are lowered in ast lowering)
 - rust-lang#135875 (Remove `Copy` bound from `enter_forall`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit e4c144b into rust-lang:master Jan 22, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 22, 2025
@japaric japaric deleted the ja-gh135819 branch January 23, 2025 13:34
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@bjorn3 bjorn3 bjorn3 left review comments

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.86.0
Development

Successfully merging this pull request may close these issues.

UI tests that pass --test to rustc fail on panic=abort targets
6 participants
@japaric @rustbot @jieyouxu @bors @bjorn3 @SparrowLii