auto merge of #10336 : ksh8281/rust/fix_rpass_core-run-destroy_for_an…

…droid, r=yichoi fix rpass core-run-destroy for android
rust-lang · Nov 7, 2013 · 03f3051 · 03f3051
2 parents a5f6f85 + f1cbb4d
commit 03f3051
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs
@@ -37,9 +37,12 @@ fn test_destroy_twice() {
 
 fn test_destroy_actually_kills(force: bool) {
 
-    #[cfg(unix)]
+    #[cfg(unix,not(target_os="android"))]
     static BLOCK_COMMAND: &'static str = "cat";
 
+    #[cfg(unix,target_os="android")]
+    static BLOCK_COMMAND: &'static str = "/system/bin/cat";
+
     #[cfg(windows)]
     static BLOCK_COMMAND: &'static str = "cmd";