Skip to content

Commit 3a55a7a

Browse files
committed
Don't test process_vm_readv on Travis arches that use qemu
1 parent 50eed01 commit 3a55a7a

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CONTRIBUTING.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,11 @@ locally. More information is available in the [CI Readme][ci-readme].
8888
### Disabling a test in the CI environment
8989

9090
Sometimes there are features that cannot be tested in the CI environment.
91-
To stop a test from running under CI, add `#[cfg_attr(travis, ignore)]`
92-
to it. Please include a comment describing the reason it shouldn't run
93-
under CI, and a link to an upstream issue if possible!
91+
To stop a test from causing a CI failure, add `#[cfg_attr(travis, ignore)]`
92+
to it. To prevent it from running entirely (in case the test process is
93+
dying), add `#[cfg(not(travis))]`. Please include a comment describing
94+
the reason it shouldn't run under CI, and a link to an upstream issue if
95+
possible!
9496

9597
## bors, the bot who merges all the PRs
9698

test/sys/test_uio.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ fn test_preadv() {
193193

194194
#[test]
195195
#[cfg(any(target_os = "linux", target_os = "android"))]
196+
// qemu-user does not yet implement process_vm_readv, cf. PR #568
197+
#[cfg(not(all(travis, any(target_arch = "arm", target_arch = "aarch64"))))]
196198
fn test_process_vm_readv() {
197199
use nix::unistd::ForkResult::*;
198200
use nix::sys::signal::*;

0 commit comments

Comments
 (0)