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

Condition unwinding tests on cfg(panic = "unwind") #5384

Merged
merged 1 commit into from Jan 21, 2023
Merged

Condition unwinding tests on cfg(panic = "unwind") #5384

merged 1 commit into from Jan 21, 2023

Conversation

chriswailes
Copy link
Contributor

These tests rely on unwinding and will fail if built with panic-abort.

Motivation

The Rust toolchain for Android is built with panic-abort and these tests will fail without these changes.

Solution

Add a cfg annotation that only enables these tests if panic = "unwind".

@Darksonn Darksonn added the A-tokio Area: The main tokio crate label Jan 20, 2023
taiki-e
taiki-e approved these changes Jan 21, 2023
View reviewed changes
Copy link
Member

@taiki-e taiki-e left a comment

Choose a reason for hiding this comment

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

Thanks! cfg(panic) doesn't work on our MSRV (it stabilized on 1.60), but we don't run tests on MSRV, so I think this is ok.

@Darksonn
Copy link
Contributor

Yeah, tests aren't subject to the MSRV.

@Darksonn Darksonn merged commit c90757f into tokio-rs:master Jan 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@taiki-e taiki-e taiki-e approved these changes

Assignees
No one assigned
Labels
A-tokio Area: The main tokio crate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@chriswailes @Darksonn @taiki-e