Skip to content

Commit

Permalink
change the signal used to test signal_reported_right
Browse files Browse the repository at this point in the history
The test "signal_reported_right" send a signal `1` to `/bin/sh`, and check
the status code to check if the signal is reported right.

Under OpenBSD, the signal `1` (`SIGHUP`) is catched by `/bin/sh`,
resulting the test failed.

Use the uncatchable signal `9` (`SIGKILL`) for test.
  • Loading branch information
semarie committed Feb 16, 2015
1 parent c5db290 commit 5a6ea7a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/libstd/old_io/process.rs
Expand Up @@ -800,12 +800,12 @@ mod tests {
#[cfg(all(unix, not(target_os="android")))]
#[test]
fn signal_reported_right() {
let p = Command::new("/bin/sh").arg("-c").arg("kill -1 $$").spawn();
let p = Command::new("/bin/sh").arg("-c").arg("kill -9 $$").spawn();
assert!(p.is_ok());
let mut p = p.unwrap();
match p.wait().unwrap() {
process::ExitSignal(1) => {},
result => panic!("not terminated by signal 1 (instead, {})", result),
process::ExitSignal(9) => {},
result => panic!("not terminated by signal 9 (instead, {})", result),
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/libstd/process.rs
Expand Up @@ -537,12 +537,12 @@ mod tests {
fn signal_reported_right() {
use os::unix::ExitStatusExt;

let p = Command::new("/bin/sh").arg("-c").arg("kill -1 $$").spawn();
let p = Command::new("/bin/sh").arg("-c").arg("kill -9 $$").spawn();
assert!(p.is_ok());
let mut p = p.unwrap();
match p.wait().unwrap().signal() {
Some(1) => {},
result => panic!("not terminated by signal 1 (instead, {:?})", result),
Some(9) => {},
result => panic!("not terminated by signal 9 (instead, {:?})", result),
}
}

Expand Down

0 comments on commit 5a6ea7a

Please sign in to comment.