nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-28 02:57:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #22404 - semarie:signal_reported_right, r=aturon

Browse Source 
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.
This commit is contained in:
Manish Goregaokar 2015-02-17 15:51:18 +05:30
commit 1a1ac6c1ab
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstd/old_io/process.rs
View File

@ -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),
}
}

6
src/libstd/process.rs
View File

@ -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),
}
}