about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2024-11-10 12:01:30 +0000
committerGitHub <noreply@github.com>2024-11-10 12:01:30 +0000
commit881f2ec1b079b9c263bef8735baab5d9c8aef60c (patch)
tree208ff7ff1caef74d49f82ec63ebd5d47751e19ff
parent673d9c3e85cae19a822ebf6b928dc289bb57e812 (diff)
parente8a3ffee490d5e20502247330fec061f558ea251 (diff)
downloadrust-881f2ec1b079b9c263bef8735baab5d9c8aef60c.tar.gz
rust-881f2ec1b079b9c263bef8735baab5d9c8aef60c.zip
Merge pull request #4022 from RalfJung/linux-futex
fix linux-futex test being accidentally disabled
-rw-r--r--src/tools/miri/tests/pass-dep/concurrency/linux-futex.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/tools/miri/tests/pass-dep/concurrency/linux-futex.rs b/src/tools/miri/tests/pass-dep/concurrency/linux-futex.rs
index d1fcf61c4c8..3adeb89ecec 100644
--- a/src/tools/miri/tests/pass-dep/concurrency/linux-futex.rs
+++ b/src/tools/miri/tests/pass-dep/concurrency/linux-futex.rs
@@ -1,5 +1,4 @@
-//@only-target: linux
-//@only-target: android
+//@only-target: linux android
 //@compile-flags: -Zmiri-disable-isolation
 
 // FIXME(static_mut_refs): Do not allow `static_mut_refs` lint
@@ -8,8 +7,8 @@
 use std::mem::MaybeUninit;
 use std::ptr::{self, addr_of};
 use std::sync::atomic::{AtomicI32, Ordering};
-use std::thread;
 use std::time::{Duration, Instant};
+use std::{io, thread};
 
 fn wake_nobody() {
     let futex = 0;