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.

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

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

japaric
Copy link
Member

@japaric japaric commented Jan 21, 2025

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
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
Contributor

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
//@ [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
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
Contributor

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
make UI tests that use `--test` work on panic=abort targets

By passing `-Zpanic_abort_test`.

fixes rust-lang#135819
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 22, 2025
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
make UI tests that use `--test` work on panic=abort targets

By passing `-Zpanic_abort_test`.

fixes rust-lang#135819
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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
Development

Successfully merging this pull request may close these issues.

UI tests that pass --test to rustc fail on panic=abort targets
6 participants