about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-03-05 22:10:02 +0100
committerGitHub <noreply@github.com>2024-03-05 22:10:02 +0100
commit076043346d7ae779623b3d703c32bb391188d235 (patch)
tree392c89d4c8b4b35207f44ed5abe26c839df100ea
parentc1bb406a213ecd58d7125d543020c7aebba85984 (diff)
parent960dd38abe18f7da6a08866736ba77aa8259de33 (diff)
downloadrust-076043346d7ae779623b3d703c32bb391188d235.tar.gz
rust-076043346d7ae779623b3d703c32bb391188d235.zip
Rollup merge of #122016 - RalfJung:will_wake, r=dtolnay
will_wake tests fail on Miri and that is expected

Follow-up to https://github.com/rust-lang/rust/pull/121622
r? ```@cuviper``` ```@dtolnay```
-rw-r--r--library/alloc/tests/task.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/alloc/tests/task.rs b/library/alloc/tests/task.rs
index 0f8d9218980..034039a1eae 100644
--- a/library/alloc/tests/task.rs
+++ b/library/alloc/tests/task.rs
@@ -4,6 +4,7 @@ use alloc::task::{LocalWake, Wake};
 use core::task::{LocalWaker, Waker};
 
 #[test]
+#[cfg_attr(miri, should_panic)] // `will_wake` doesn't guarantee that this test will work, and indeed on Miri it fails
 fn test_waker_will_wake_clone() {
     struct NoopWaker;
 
@@ -19,6 +20,7 @@ fn test_waker_will_wake_clone() {
 }
 
 #[test]
+#[cfg_attr(miri, should_panic)] // `will_wake` doesn't guarantee that this test will work, and indeed on Miri it fails
 fn test_local_waker_will_wake_clone() {
     struct NoopWaker;