Skip to content

Commit a8beaa3

Browse files
authored
Rollup merge of #78878 - shepmaster:intersecting-ignores, r=Mark-Simulacrum
Avoid overlapping cfg attributes when both macOS and aarch64 r? ``@Mark-Simulacrum``
2 parents 479817a + b13817a commit a8beaa3

File tree

1 file changed

+15
-10
lines changed
  • library/std/src/sys/unix/process/process_common

1 file changed

+15
-10
lines changed

library/std/src/sys/unix/process/process_common/tests.rs

+15-10
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,22 @@ macro_rules! t {
1414
};
1515
}
1616

17-
// See #14232 for more information, but it appears that signal delivery to a
18-
// newly spawned process may just be raced in the macOS, so to prevent this
19-
// test from being flaky we ignore it on macOS.
2017
#[test]
21-
#[cfg_attr(target_os = "macos", ignore)]
22-
// When run under our current QEMU emulation test suite this test fails,
23-
// although the reason isn't very clear as to why. For now this test is
24-
// ignored there.
25-
#[cfg_attr(target_arch = "arm", ignore)]
26-
#[cfg_attr(target_arch = "aarch64", ignore)]
27-
#[cfg_attr(target_arch = "riscv64", ignore)]
18+
#[cfg_attr(
19+
any(
20+
// See #14232 for more information, but it appears that signal delivery to a
21+
// newly spawned process may just be raced in the macOS, so to prevent this
22+
// test from being flaky we ignore it on macOS.
23+
target_os = "macos",
24+
// When run under our current QEMU emulation test suite this test fails,
25+
// although the reason isn't very clear as to why. For now this test is
26+
// ignored there.
27+
target_arch = "arm",
28+
target_arch = "aarch64",
29+
target_arch = "riscv64",
30+
),
31+
ignore
32+
)]
2833
fn test_process_mask() {
2934
unsafe {
3035
// Test to make sure that a signal mask does not get inherited.

0 commit comments

Comments
 (0)