about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJake Goulding <jake.goulding@gmail.com>2020-11-08 09:43:51 -0500
committerJake Goulding <jake.goulding@gmail.com>2020-11-08 09:43:51 -0500
commitb13817a79566cf313b4bebed3a5caf5ea8879f4e (patch)
tree3fe6b69c0017dbe585c4ea5d518aa83fe2a936d5
parent87a0997ef9c0bfad0ba362741afa601d8fb285b8 (diff)
downloadrust-b13817a79566cf313b4bebed3a5caf5ea8879f4e.tar.gz
rust-b13817a79566cf313b4bebed3a5caf5ea8879f4e.zip
Avoid overlapping cfg attributes when both macOS and aarch64
-rw-r--r--library/std/src/sys/unix/process/process_common/tests.rs25
1 files changed, 15 insertions, 10 deletions
diff --git a/library/std/src/sys/unix/process/process_common/tests.rs b/library/std/src/sys/unix/process/process_common/tests.rs
index e72fbf0beb4..10aa34e9443 100644
--- a/library/std/src/sys/unix/process/process_common/tests.rs
+++ b/library/std/src/sys/unix/process/process_common/tests.rs
@@ -14,17 +14,22 @@ macro_rules! t {
     };
 }
 
-// See #14232 for more information, but it appears that signal delivery to a
-// newly spawned process may just be raced in the macOS, so to prevent this
-// test from being flaky we ignore it on macOS.
 #[test]
-#[cfg_attr(target_os = "macos", ignore)]
-// When run under our current QEMU emulation test suite this test fails,
-// although the reason isn't very clear as to why. For now this test is
-// ignored there.
-#[cfg_attr(target_arch = "arm", ignore)]
-#[cfg_attr(target_arch = "aarch64", ignore)]
-#[cfg_attr(target_arch = "riscv64", ignore)]
+#[cfg_attr(
+    any(
+        // See #14232 for more information, but it appears that signal delivery to a
+        // newly spawned process may just be raced in the macOS, so to prevent this
+        // test from being flaky we ignore it on macOS.
+        target_os = "macos",
+        // When run under our current QEMU emulation test suite this test fails,
+        // although the reason isn't very clear as to why. For now this test is
+        // ignored there.
+        target_arch = "arm",
+        target_arch = "aarch64",
+        target_arch = "riscv64",
+    ),
+    ignore
+)]
 fn test_process_mask() {
     unsafe {
         // Test to make sure that a signal mask does not get inherited.