Skip to content

Commit

Permalink
Rollup merge of #78878 - shepmaster:intersecting-ignores, r=Mark-Simu…
Browse files Browse the repository at this point in the history
…lacrum

Avoid overlapping cfg attributes when both macOS and aarch64

r? `@Mark-Simulacrum`
  • Loading branch information
Dylan-DPC authored Nov 8, 2020
2 parents 7cc8ab3 + b13817a commit 1385035
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions library/std/src/sys/unix/process/process_common/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 1385035

Please sign in to comment.