diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-11-09 01:13:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 01:13:48 +0100 |
| commit | a8beaa3b3c0f5307197b3d8d421d0ac05c0d7a6e (patch) | |
| tree | 8eddc7cb235e1b80463f9bf68d4b51838bee9458 /library/std/src | |
| parent | 479817acb0a9bbd88b9cb8da9b1fad530fae410a (diff) | |
| parent | b13817a79566cf313b4bebed3a5caf5ea8879f4e (diff) | |
| download | rust-a8beaa3b3c0f5307197b3d8d421d0ac05c0d7a6e.tar.gz rust-a8beaa3b3c0f5307197b3d8d421d0ac05c0d7a6e.zip | |
Rollup merge of #78878 - shepmaster:intersecting-ignores, r=Mark-Simulacrum
Avoid overlapping cfg attributes when both macOS and aarch64 r? ``@Mark-Simulacrum``
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/sys/unix/process/process_common/tests.rs | 25 |
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. |
