diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-06-09 11:31:52 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-09 11:31:52 +0000 |
commit | 01a5927e2c9947bb9dd983cccb41f20573fb1527 (patch) | |
tree | 68c791012c3839f6a7fc8d97a30f80344eccc639 /test | |
parent | b3ba2b5f63ddafa1644452030c1fac9a9cdd2641 (diff) | |
parent | c3081e4896344dbf0c27103a60c90eaa8d35715e (diff) | |
download | nix-01a5927e2c9947bb9dd983cccb41f20573fb1527.zip |
Merge #1739
1739: ppoll: make sigmask parameter optional r=rtzoeller a=stefano-garzarella
ppoll(2) supports 'sigmask' as NULL. In that case no signal mask
manipulation is performed.
Let's make `sigmask` parameter of `nix::poll::ppoll` optional
to allow that behaviour.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Co-authored-by: Stefano Garzarella <sgarzare@redhat.com>
Diffstat (limited to 'test')
-rw-r--r-- | test/test_poll.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_poll.rs b/test/test_poll.rs index e4b369f3..120e8e56 100644 --- a/test/test_poll.rs +++ b/test/test_poll.rs @@ -53,14 +53,14 @@ fn test_ppoll() { // Poll an idle pipe. Should timeout let sigset = SigSet::empty(); - let nfds = loop_while_eintr!(ppoll(&mut fds, Some(timeout), sigset)); + let nfds = loop_while_eintr!(ppoll(&mut fds, Some(timeout), Some(sigset))); assert_eq!(nfds, 0); assert!(!fds[0].revents().unwrap().contains(PollFlags::POLLIN)); write(w, b".").unwrap(); // Poll a readable pipe. Should return an event. - let nfds = ppoll(&mut fds, Some(timeout), SigSet::empty()).unwrap(); + let nfds = ppoll(&mut fds, Some(timeout), None).unwrap(); assert_eq!(nfds, 1); assert!(fds[0].revents().unwrap().contains(PollFlags::POLLIN)); } |