Merge #1033

1033: Fix the tests with libc 0.2.49 and Rust 1.33.0 r=asomers a=asomers Several symbols are now marked as deprecated on OSX. Co-authored-by: Alan Somers <[email protected]>
nix-rust · Mar 4, 2019 · 6e94c3c · 6e94c3c
2 parents a2fa282 + 439b930
commit 6e94c3c
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 62 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#1020](https://github.com/nix-rust/nix/pull/1020))
 
 ### Removed
+- `Daemon`, `NOTE_REAP`, and `NOTE_EXIT_REPARENTED` are now deprecated on OSX
+  and iOS.
+  ([#1033](https://github.com/nix-rust/nix/pull/1033))
 
 ## [0.13.0] - 2019-01-15
 ### Added

diff --git a/src/sys/event.rs b/src/sys/event.rs
@@ -135,6 +135,8 @@ libc_bitflags!(
         NOTE_EXEC;
         NOTE_EXIT;
         #[cfg(any(target_os = "macos", target_os = "ios"))]
+        #[deprecated( since="0.14.0", note="Deprecated since OSX 10.9")]
+        #[allow(deprecated)]
         NOTE_EXIT_REPARENTED;
         #[cfg(any(target_os = "macos", target_os = "ios"))]
         NOTE_EXITSTATUS;
@@ -183,6 +185,9 @@ libc_bitflags!(
         NOTE_PCTRLMASK;
         NOTE_PDATAMASK;
         #[cfg(any(target_os = "macos", target_os = "ios"))]
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        #[deprecated( since="0.14.0", note="Deprecated since OSX 10.9")]
+        #[allow(deprecated)]
         NOTE_REAP;
         NOTE_RENAME;
         NOTE_REVOKE;

diff --git a/src/sys/signal.rs b/src/sys/signal.rs
@@ -833,6 +833,7 @@ mod sigevent {
 
 #[cfg(test)]
 mod tests {
+    use std::thread;
     use super::*;
 
     #[test]
@@ -886,112 +887,120 @@ mod tests {
         assert!(two_signals.contains(SIGUSR2));
     }
 
-    // This test doesn't actually test get_mask functionality, see the set_mask test for that.
-    #[test]
-    fn test_thread_signal_get_mask() {
-        assert!(SigSet::thread_get_mask().is_ok());
-    }
-
     #[test]
     fn test_thread_signal_set_mask() {
-        let prev_mask = SigSet::thread_get_mask().expect("Failed to get existing signal mask!");
+        thread::spawn(|| {
+            let prev_mask = SigSet::thread_get_mask()
+                .expect("Failed to get existing signal mask!");
 
-        let mut test_mask = prev_mask;
-        test_mask.add(SIGUSR1);
+            let mut test_mask = prev_mask;
+            test_mask.add(SIGUSR1);
 
-        assert!(test_mask.thread_set_mask().is_ok());
-        let new_mask = SigSet::thread_get_mask().expect("Failed to get new mask!");
+            assert!(test_mask.thread_set_mask().is_ok());
+            let new_mask = SigSet::thread_get_mask()
+                .expect("Failed to get new mask!");
 
-        assert!(new_mask.contains(SIGUSR1));
-        assert!(!new_mask.contains(SIGUSR2));
+            assert!(new_mask.contains(SIGUSR1));
+            assert!(!new_mask.contains(SIGUSR2));
 
-        prev_mask.thread_set_mask().expect("Failed to revert signal mask!");
+            prev_mask.thread_set_mask().expect("Failed to revert signal mask!");
+        }).join().unwrap();
     }
 
     #[test]
     fn test_thread_signal_block() {
-        let mut mask = SigSet::empty();
-        mask.add(SIGUSR1);
+        thread::spawn(|| {
+            let mut mask = SigSet::empty();
+            mask.add(SIGUSR1);
 
-        assert!(mask.thread_block().is_ok());
+            assert!(mask.thread_block().is_ok());
 
-        assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
+            assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
+        }).join().unwrap();
     }
 
     #[test]
     fn test_thread_signal_unblock() {
-        let mut mask = SigSet::empty();
-        mask.add(SIGUSR1);
+        thread::spawn(|| {
+            let mut mask = SigSet::empty();
+            mask.add(SIGUSR1);
 
-        assert!(mask.thread_unblock().is_ok());
+            assert!(mask.thread_unblock().is_ok());
 
-        assert!(!SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
+            assert!(!SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
+        }).join().unwrap();
     }
 
     #[test]
     fn test_thread_signal_swap() {
-        let mut mask = SigSet::empty();
-        mask.add(SIGUSR1);
-        mask.thread_block().unwrap();
+        thread::spawn(|| {
+            let mut mask = SigSet::empty();
+            mask.add(SIGUSR1);
+            mask.thread_block().unwrap();
 
-        assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
+            assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR1));
 
-        let mut mask2 = SigSet::empty();
-        mask2.add(SIGUSR2);
+            let mut mask2 = SigSet::empty();
+            mask2.add(SIGUSR2);
 
-        let oldmask = mask2.thread_swap_mask(SigmaskHow::SIG_SETMASK).unwrap();
+            let oldmask = mask2.thread_swap_mask(SigmaskHow::SIG_SETMASK)
+                .unwrap();
 
-        assert!(oldmask.contains(SIGUSR1));
-        assert!(!oldmask.contains(SIGUSR2));
+            assert!(oldmask.contains(SIGUSR1));
+            assert!(!oldmask.contains(SIGUSR2));
 
-        assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR2));
+            assert!(SigSet::thread_get_mask().unwrap().contains(SIGUSR2));
+        }).join().unwrap();
     }
 
     #[test]
     fn test_sigaction() {
         use libc;
+        thread::spawn(|| {
+            extern fn test_sigaction_handler(_: libc::c_int) {}
+            extern fn test_sigaction_action(_: libc::c_int,
+                _: *mut libc::siginfo_t, _: *mut libc::c_void) {}
 
-        extern fn test_sigaction_handler(_: libc::c_int) {}
-        extern fn test_sigaction_action(_: libc::c_int,
-            _: *mut libc::siginfo_t, _: *mut libc::c_void) {}
+            let handler_sig = SigHandler::Handler(test_sigaction_handler);
 
-        let handler_sig = SigHandler::Handler(test_sigaction_handler);
+            let flags = SaFlags::SA_ONSTACK | SaFlags::SA_RESTART |
+                        SaFlags::SA_SIGINFO;
 
-        let flags = SaFlags::SA_ONSTACK | SaFlags::SA_RESTART | SaFlags::SA_SIGINFO;
+            let mut mask = SigSet::empty();
+            mask.add(SIGUSR1);
 
-        let mut mask = SigSet::empty();
-        mask.add(SIGUSR1);
+            let action_sig = SigAction::new(handler_sig, flags, mask);
 
-        let action_sig = SigAction::new(handler_sig, flags, mask);
+            assert_eq!(action_sig.flags(),
+                       SaFlags::SA_ONSTACK | SaFlags::SA_RESTART);
+            assert_eq!(action_sig.handler(), handler_sig);
 
-        assert_eq!(action_sig.flags(), SaFlags::SA_ONSTACK | SaFlags::SA_RESTART);
-        assert_eq!(action_sig.handler(), handler_sig);
-
-        mask = action_sig.mask();
-        assert!(mask.contains(SIGUSR1));
-        assert!(!mask.contains(SIGUSR2));
+            mask = action_sig.mask();
+            assert!(mask.contains(SIGUSR1));
+            assert!(!mask.contains(SIGUSR2));
 
-        let handler_act = SigHandler::SigAction(test_sigaction_action);
-        let action_act = SigAction::new(handler_act, flags, mask);
-        assert_eq!(action_act.handler(), handler_act);
+            let handler_act = SigHandler::SigAction(test_sigaction_action);
+            let action_act = SigAction::new(handler_act, flags, mask);
+            assert_eq!(action_act.handler(), handler_act);
 
-        let action_dfl = SigAction::new(SigHandler::SigDfl, flags, mask);
-        assert_eq!(action_dfl.handler(), SigHandler::SigDfl);
+            let action_dfl = SigAction::new(SigHandler::SigDfl, flags, mask);
+            assert_eq!(action_dfl.handler(), SigHandler::SigDfl);
 
-        let action_ign = SigAction::new(SigHandler::SigIgn, flags, mask);
-        assert_eq!(action_ign.handler(), SigHandler::SigIgn);
+            let action_ign = SigAction::new(SigHandler::SigIgn, flags, mask);
+            assert_eq!(action_ign.handler(), SigHandler::SigIgn);
+        }).join().unwrap();
     }
 
-    // TODO(#251): Re-enable after figuring out flakiness.
-    #[cfg(not(any(target_os = "macos", target_os = "ios")))]
     #[test]
     fn test_sigwait() {
-        let mut mask = SigSet::empty();
-        mask.add(SIGUSR1);
-        mask.add(SIGUSR2);
-        mask.thread_block().unwrap();
-
-        raise(SIGUSR1).unwrap();
-        assert_eq!(mask.wait().unwrap(), SIGUSR1);
+        thread::spawn(|| {
+            let mut mask = SigSet::empty();
+            mask.add(SIGUSR1);
+            mask.add(SIGUSR2);
+            mask.thread_block().unwrap();
+
+            raise(SIGUSR1).unwrap();
+            assert_eq!(mask.wait().unwrap(), SIGUSR1);
+        }).join().unwrap();
     }
 }
diff --git a/src/unistd.rs b/src/unistd.rs
@@ -828,6 +828,11 @@ pub fn execveat(dirfd: RawFd, pathname: &CString, args: &[CString],
 ///   descriptors will remain identical after daemonizing.
 /// * `noclose = false`: The process' stdin, stdout, and stderr will point to
 ///   `/dev/null` after daemonizing.
+#[cfg_attr(any(target_os = "macos", target_os = "ios"), deprecated(
+    since="0.14.0",
+    note="Deprecated in MacOSX 10.5"
+))]
+#[cfg_attr(any(target_os = "macos", target_os = "ios"), allow(deprecated))]
 pub fn daemon(nochdir: bool, noclose: bool) -> Result<()> {
     let res = unsafe { libc::daemon(nochdir as c_int, noclose as c_int) };
     Errno::result(res).map(drop)