---

yaml
---
r: 82118
b: refs/heads/master
c: ff30566
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e08391c3f1933a290ec38c6d6f6d21befba3f756
+refs/heads/master: ff30566954514b2c3bae3b8d428670abbca05f5e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/test/run-pass/rtio-processes.rs

@@ -29,7 +29,7 @@ use std::rt::io::pipe::*;
 use std::str;
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn smoke() {
     let io = ~[];
     let args = ProcessConfig {
@@ -46,7 +46,7 @@ fn smoke() {
 }
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn smoke_failure() {
     let io = ~[];
     let args = ProcessConfig {
@@ -63,7 +63,7 @@ fn smoke_failure() {
 }
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn exit_reported_right() {
     let io = ~[];
     let args = ProcessConfig {
@@ -103,7 +103,7 @@ fn run_output(args: ProcessConfig) -> ~str {
 }
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn stdout_works() {
     let pipe = PipeStream::new().unwrap();
     let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -118,7 +118,7 @@ fn stdout_works() {
 }
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn set_cwd_works() {
     let pipe = PipeStream::new().unwrap();
     let io = ~[Ignored, CreatePipe(pipe, false, true)];
@@ -134,7 +134,7 @@ fn set_cwd_works() {
 }
 
 #[test]
-#[cfg(unix, not(android))]
+#[cfg(unix, not(target_os="android"))]
 fn stdin_works() {
     let input = PipeStream::new().unwrap();
     let output = PipeStream::new().unwrap();