auto merge of #10336 : ksh8281/rust/fix_rpass_core-run-destroy_for_android, r=yichoi

fix rpass core-run-destroy for android

auto merge of #10336 : ksh8281/rust/fix_rpass_core-run-destroy_for_android, r=yichoi
fix rpass core-run-destroy for android
03f30515 · bors · a5f6f853 · f1cbb4d5 · 03f30515
隐藏空白更改
内联并排

Showing with 4 addition and 1 deletion

src/test/run-pass/core-run-destroy.rs src/test/run-pass/core-run-destroy.rs +4 -1

未找到文件。
--- 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";