Skip to content

Miri: run panic-catching tests in liballoc #66662

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

Merged
merged 4 commits into from
Dec 1, 2019

Conversation

RalfJung
Copy link
Member

I also converted two tests from using thread::spawn(...).join() just for catching panics, to catch_panic, so that Miri can run them.

@rust-highfive
Copy link
Contributor

r? @cramertj

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 23, 2019
@@ -1643,6 +1648,9 @@ fn panic_safe() {
}
}
}

// Set default panic hook again.
drop(panic::take_hook());
Copy link
Member Author

Choose a reason for hiding this comment

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

Setting the global panic hook in a test seems like a bad idea anyway as it affects other tests running in parallel, but this way at least we do not affect tests running later.

@JohnCSimon JohnCSimon 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-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2019
@JohnCSimon
Copy link
Member

JohnCSimon commented Nov 30, 2019

Ping from triage:
@RalfJung can you post your status on this PR? It looks like it's waiting on other work. Thank you.

@RalfJung
Copy link
Member Author

This is waiting for review.

r? @dtolnay

@rust-highfive rust-highfive assigned dtolnay and unassigned cramertj Nov 30, 2019
@RalfJung RalfJung added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 30, 2019
@dtolnay
Copy link
Member

dtolnay commented Nov 30, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 30, 2019

📌 Commit a229979 has been approved by dtolnay

@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 Nov 30, 2019
@bors
Copy link
Collaborator

bors commented Nov 30, 2019

⌛ Testing commit a229979 with merge e5292bd57e5d24e3688d79c358690cc6a3d46c1e...

@rust-highfive

This comment has been minimized.

@bors
Copy link
Collaborator

bors commented Nov 30, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 30, 2019
@Centril
Copy link
Contributor

Centril commented Nov 30, 2019

@bors retry spurious

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 30, 2019
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 30, 2019
Centril added a commit to Centril/rust that referenced this pull request Dec 1, 2019
Miri: run panic-catching tests in liballoc

I also converted two tests from using `thread::spawn(...).join()` just for catching panics, to `catch_panic`, so that Miri can run them.
bors added a commit that referenced this pull request Dec 1, 2019
Rollup of 9 pull requests

Successful merges:

 - #66503 (More useful test error messages on should_panic(expected=...) mismatch)
 - #66662 (Miri: run panic-catching tests in liballoc)
 - #66679 (Improve lifetime errors with implicit trait object lifetimes)
 - #66726 (Use recursion_limit for const eval stack limit)
 - #66790 (Do `min_const_fn` checks for `SetDiscriminant`s target)
 - #66832 (const_prop: detect and avoid catching Miri errors that require allocation)
 - #66880 (Add long error code explanation message for E0203)
 - #66890 (Format liballoc with rustfmt)
 - #66896 (pass Queries to compiler callbacks)

Failed merges:

r? @ghost
@bors bors merged commit a229979 into rust-lang:master Dec 1, 2019
@RalfJung RalfJung deleted the miri-test-liballoc branch December 1, 2019 09:34
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants