diff options
| author | bors <bors@rust-lang.org> | 2013-11-07 02:41:10 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-11-07 02:41:10 -0800 |
| commit | 03f30515f4c8ca91dc7ceba3628f6eb1b3259ac5 (patch) | |
| tree | ab47a36b3e101dc6ad73df59237ee1357b72d180 | |
| parent | a5f6f853f10ec88dc2608a8d2f969a4cf9e2e07d (diff) | |
| parent | f1cbb4d566428c74f98acdc4805ffbda7c9994e0 (diff) | |
| download | rust-03f30515f4c8ca91dc7ceba3628f6eb1b3259ac5.tar.gz rust-03f30515f4c8ca91dc7ceba3628f6eb1b3259ac5.zip | |
auto merge of #10336 : ksh8281/rust/fix_rpass_core-run-destroy_for_android, r=yichoi
fix rpass core-run-destroy for android
| -rw-r--r-- | src/test/run-pass/core-run-destroy.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/test/run-pass/core-run-destroy.rs b/src/test/run-pass/core-run-destroy.rs index aee4c7e40bc..8a7a44d7f30 100644 --- 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"; |