Remove signalfd feature in favor of conditional compilation

Author: Susurrus

Cargo.toml

@@ -17,7 +17,6 @@ exclude     = [
 
 [features]
 execvpe = []
-signalfd = []
 
 [dependencies]
 libc = "0.2.25"
@@ -36,12 +35,6 @@ nix-test = { path = "nix-test", version = "0.0.1" }
 name = "test"
 path = "test/test.rs"
 
-[[test]]
-name = "test-signalfd"
-path = "test/test_signalfd.rs"
-harness = false
-test = true
-
 [[test]]
 name = "test-mount"
 path = "test/test_mount.rs"

src/sys/mod.rs

@@ -24,7 +24,6 @@ pub mod sendfile;
 pub mod signal;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
-#[cfg(feature = "signalfd")]
 pub mod signalfd;
 
 pub mod socket;

test/test.rs

@@ -11,7 +11,7 @@ extern crate nix_test as nixtest;
 
 mod sys;
 mod test_fcntl;
-#[cfg(any(target_os = "linux"))]
+#[cfg(target_os = "linux")]
 mod test_mq;
 mod test_net;
 mod test_nix_path;
@@ -20,6 +20,8 @@ mod test_poll;
 mod test_pty;
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod test_sendfile;
+#[cfg(target_os = "linux")]
+mod test_signalfd;
 mod test_stat;
 mod test_unistd;
 

test/test_signalfd.rs

@@ -1,18 +1,12 @@
-extern crate nix;
-
-#[cfg(feature = "signalfd")]
-use nix::sys::signalfd::SignalFd;
-#[cfg(feature = "signalfd")]
-use nix::sys::signal;
-#[cfg(feature = "signalfd")]
-use nix::unistd;
-
-#[cfg(feature = "signalfd")]
-fn main() {
-    print!("test test_signalfd ... ");
+#[cfg(target_os = "linux")]
+#[test]
+fn test_signalfd() {
+    use nix::sys::signalfd::SignalFd;
+    use nix::sys::signal;
+    use nix::unistd;
 
     let mut mask = signal::SigSet::empty();
-    mask.add(signal::SIGUSR1).unwrap();
+    mask.add(signal::SIGUSR1);
     mask.thread_block().unwrap();
 
     let mut fd = SignalFd::new(&mask).unwrap();
@@ -22,9 +16,6 @@ fn main() {
 
     let res = fd.read_signal();
 
-    assert_eq!(res.unwrap().unwrap().ssi_signo as i32, signal::SIGUSR1);
-    println!("ok");
+    let signo = signal::Signal::from_c_int(res.unwrap().unwrap().ssi_signo as i32).unwrap();
+    assert_eq!(signo, signal::SIGUSR1);
 }
-
-#[cfg(not(feature = "signalfd"))]
-fn main() {}