Skip to content

Commit

Permalink
Remove the TODO comments, add unwrap() for ptrace.
Browse files Browse the repository at this point in the history
  • Loading branch information
marmistrz committed Jul 25, 2017
1 parent 6ce39a6 commit bf93180
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions test/sys/test_wait.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ mod ptrace {
use libc::_exit;

fn ptrace_child() -> ! {
// TODO ptrace::traceme will be added in #666
let _ = ptrace::ptrace(PTRACE_TRACEME, Pid::from_raw(0), ptr::null_mut(), ptr::null_mut());
ptrace::ptrace(PTRACE_TRACEME, Pid::from_raw(0), ptr::null_mut(), ptr::null_mut()).unwrap();
// As recommended by ptrace(2), raise SIGTRAP to pause the child
// until the parent is ready to continue
let _ = raise(SIGTRAP);
Expand All @@ -66,11 +65,9 @@ mod ptrace {
assert!(ptrace::setoptions(child, PTRACE_O_TRACESYSGOOD | PTRACE_O_TRACEEXIT).is_ok());

// First, stop on the next system call, which will be exit()
// TODO ptrace::syscall will be added in #666
assert!(ptrace::ptrace(PTRACE_SYSCALL, child, ptr::null_mut(), ptr::null_mut()).is_ok());
assert_eq!(waitpid(child, None), Ok(WaitStatus::PtraceSyscall(child)));
// Then get the ptrace event for the process exiting
// TODO ptrace::cont will be added in #666
assert!(ptrace::ptrace(PTRACE_CONT, child, ptr::null_mut(), ptr::null_mut()).is_ok());
assert_eq!(waitpid(child, None), Ok(WaitStatus::PtraceEvent(child, SIGTRAP, PTRACE_EVENT_EXIT)));
// Finally get the normal wait() result, now that the process has exited
Expand Down

0 comments on commit bf93180

Please sign in to comment.