about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-10-02 15:45:16 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-10-02 21:02:36 -0700
commitd911936dbdc645133ad9605f45d2bf10b73e2b20 (patch)
tree891acff8f9158a69e1884707ca3bfb70d749db2e /src/test
parentf96ee10e888bac4435973972f1799db509b3318e (diff)
parent9ac804ecabe3800a16941691bb1eb90293fd2606 (diff)
downloadrust-d911936dbdc645133ad9605f45d2bf10b73e2b20.tar.gz
rust-d911936dbdc645133ad9605f45d2bf10b73e2b20.zip
Merge branch 'travis' into rollup
Conflicts:
	.travis.yml
Diffstat (limited to 'src/test')
-rw-r--r--src/test/run-pass/unix-process-spawn-errno.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/run-pass/unix-process-spawn-errno.rs b/src/test/run-pass/unix-process-spawn-errno.rs
index 555bf2cd4c0..42b78e4ec66 100644
--- a/src/test/run-pass/unix-process-spawn-errno.rs
+++ b/src/test/run-pass/unix-process-spawn-errno.rs
@@ -9,6 +9,7 @@
 // except according to those terms.
 
 // ignore-windows
+// ignore-macos
 
 #![feature(macro_rules)]