Skip to content

Commit

Permalink
fix rpass core-run-destroy for android
Browse files Browse the repository at this point in the history
  • Loading branch information
ksh8281 committed Nov 7, 2013
1 parent 22eb11c commit f1cbb4d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/test/run-pass/core-run-destroy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down

5 comments on commit f1cbb4d

@bors
Copy link
Contributor

@bors bors commented on f1cbb4d Nov 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from yichoi
at ksh8281@f1cbb4d

@bors
Copy link
Contributor

@bors bors commented on f1cbb4d Nov 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging ksh8281/rust/fix_rpass_core-run-destroy_for_android = f1cbb4d into auto

@bors
Copy link
Contributor

@bors bors commented on f1cbb4d Nov 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ksh8281/rust/fix_rpass_core-run-destroy_for_android = f1cbb4d merged ok, testing candidate = 03f3051

@bors
Copy link
Contributor

@bors bors commented on f1cbb4d Nov 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on f1cbb4d Nov 7, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 03f3051

Please sign in to comment.