Skip to content

Commit

Permalink
Rollup merge of rust-lang#29158 - arcnmx:process-test, r=alexcrichton
Browse files Browse the repository at this point in the history
This test was mysteriously messed with as part of rust-lang#28500

r? @alexcrichton
  • Loading branch information
steveklabnik committed Oct 20, 2015
2 parents 189e247 + 9c3a062 commit c393108
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/libstd/process.rs
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ mod tests {
drop(p.wait());
}

#[cfg(unix)]
#[cfg(all(unix, not(target_os="android")))]
#[test]
fn signal_reported_right() {
use os::unix::process::ExitStatusExt;

Expand Down

0 comments on commit c393108

Please sign in to comment.