From 9b0cdf9a6ef71708fbb405d53a64e4e60b2691a2 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 28 Oct 2022 16:00:42 +0200 Subject: [PATCH] cleanup some test cfg --- .../miri/tests/pass-dep/shims/libc-misc.rs | 22 +++++++++---------- .../miri/tests/pass-dep/shims/pthreads.rs | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/tools/miri/tests/pass-dep/shims/libc-misc.rs b/src/tools/miri/tests/pass-dep/shims/libc-misc.rs index a883a3d967a..904ae2fb17f 100644 --- a/src/tools/miri/tests/pass-dep/shims/libc-misc.rs +++ b/src/tools/miri/tests/pass-dep/shims/libc-misc.rs @@ -87,7 +87,7 @@ fn test_posix_realpath_errors() { assert_eq!(e.kind(), ErrorKind::NotFound); } -#[cfg(any(target_os = "linux"))] +#[cfg(target_os = "linux")] fn test_posix_fadvise() { use std::convert::TryInto; use std::io::Write; @@ -115,7 +115,7 @@ fn test_posix_fadvise() { assert_eq!(result, 0); } -#[cfg(any(target_os = "linux"))] +#[cfg(target_os = "linux")] fn test_sync_file_range() { use std::io::Write; @@ -181,7 +181,7 @@ fn test_thread_local_errno() { } /// Tests whether clock support exists at all -#[cfg(any(target_os = "linux"))] +#[cfg(target_os = "linux")] fn test_clocks() { let mut tp = std::mem::MaybeUninit::::uninit(); let is_error = unsafe { libc::clock_gettime(libc::CLOCK_REALTIME, tp.as_mut_ptr()) }; @@ -283,9 +283,6 @@ fn test_posix_mkstemp() { } fn main() { - #[cfg(any(target_os = "linux"))] - test_posix_fadvise(); - test_posix_gettimeofday(); test_posix_mkstemp(); @@ -293,13 +290,14 @@ fn main() { test_posix_realpath_noalloc(); test_posix_realpath_errors(); - #[cfg(any(target_os = "linux"))] - test_sync_file_range(); - test_thread_local_errno(); - #[cfg(any(target_os = "linux"))] - test_clocks(); - test_isatty(); + + #[cfg(target_os = "linux")] + { + test_posix_fadvise(); + test_sync_file_range(); + test_clocks(); + } } diff --git a/src/tools/miri/tests/pass-dep/shims/pthreads.rs b/src/tools/miri/tests/pass-dep/shims/pthreads.rs index ae02a8e3c98..09dd92564d3 100644 --- a/src/tools/miri/tests/pass-dep/shims/pthreads.rs +++ b/src/tools/miri/tests/pass-dep/shims/pthreads.rs @@ -10,7 +10,7 @@ fn main() { test_rwlock_libc_static_initializer(); test_named_thread_truncation(); - #[cfg(any(target_os = "linux"))] + #[cfg(target_os = "linux")] test_mutex_libc_static_initializer_recursive(); }