---

yaml
---
r: 89910
b: refs/heads/master
c: c45870b
h: refs/heads/master
v: v3

Author: yichoi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 88831383b4d6f95b74fc588bf8932b6108184280
+refs/heads/master: c45870b85e9183a31ab0a0a8a3841977f5f2615f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/src/test/run-pass/core-run-destroy.rs

@@ -22,13 +22,23 @@ use std::io;
 
 #[test]
 fn test_destroy_once() {
-    let mut p = run::Process::new("echo", [], run::ProcessOptions::new());
+    #[cfg(not(target_os="android"))]
+    static PROG: &'static str = "echo";
+    #[cfg(target_os="android")]
+    static PROG: &'static str = "ls"; // android don't have echo binary
+
+    let mut p = run::Process::new(PROG, [], run::ProcessOptions::new());
     p.destroy(); // this shouldn't crash (and nor should the destructor)
 }
 
 #[test]
 fn test_destroy_twice() {
-    let mut p = run::Process::new("echo", [], run::ProcessOptions::new());
+    #[cfg(not(target_os="android"))]
+    static PROG: &'static str = "echo";
+    #[cfg(target_os="android")]
+    static PROG: &'static str = "ls"; // android don't have echo binary
+
+    let mut p = run::Process::new(PROG, [], run::ProcessOptions::new());
     p.destroy(); // this shouldnt crash...
     do io::io_error::cond.trap(|_| {}).inside {
         p.destroy(); // ...and nor should this (and nor should the destructor)