Re-enable more tests

Author: gnzlbg

libc-test/build.rs

@@ -1538,12 +1538,16 @@ fn test_freebsd(target: &str) {
             // Just pass all these through, no need for a "struct" prefix
             "FILE" | "fd_set" | "Dl_info" | "DIR" => ty.to_string(),
 
+            // FIXME: https://github.com/rust-lang/libc/issues/1273
             "sighandler_t" => "sig_t".to_string(),
 
             t if is_union => format!("union {}", t),
 
             t if t.ends_with("_t") => t.to_string(),
 
+            // sigval is a struct in Rust, but a union in C:
+            "sigval" => format!("union sigval"),
+
             // put `struct` in front of all structs:.
             t if is_struct => format!("struct {}", t),
 
@@ -1565,52 +1569,27 @@ fn test_freebsd(target: &str) {
         }
     });
 
-    cfg.skip_struct(move |ty| {
-        match ty {
-            // This is actually a union, not a struct
-            // FIXME: still required?
-            "sigval" => true,
-
-            _ => false,
-        }
-    });
-
-    cfg.skip_signededness(move |c| {
-        match c {
-            // FIXME: still required?
-            "LARGE_INTEGER" | "float" | "double" => true,
-            // FIXME: still required?
-            n if n.starts_with("pthread") => true,
-            // sem_t is a struct or pointer
-            // FIXME: still required?
-            "sem_t" => true,
-            // mqd_t is a pointer on FreeBSD
-            // FIXME: still required?
-            "mqd_t" => true,
-
-            _ => false,
-        }
-    });
-
     cfg.skip_const(move |name| {
         match name {
-            // FIXME: still required?
-            "SIG_DFL" | "SIG_ERR" | "SIG_IGN" => true, // sighandler_t weirdness
-
             // These constants were introduced in FreeBSD 12:
-            "SF_USER_READAHEAD" |
-            "EVFILT_EMPTY" |
-            "SO_REUSEPORT_LB" |
-            "IP_ORIGDSTADDR" |
-            "IP_RECVORIGDSTADDR" |
-            "IPV6_ORIGDSTADDR" |
-            "IPV6_RECVORIGDSTADDR"
-                if Some(12) != freebsd_ver => true,
+            "SF_USER_READAHEAD"
+            | "EVFILT_EMPTY"
+            | "SO_REUSEPORT_LB"
+            | "IP_ORIGDSTADDR"
+            | "IP_RECVORIGDSTADDR"
+            | "IPV6_ORIGDSTADDR"
+            | "IPV6_RECVORIGDSTADDR"
+                if Some(12) != freebsd_ver =>
+            {
+                true
+            }
 
+            // FIXME: There are deprecated - remove in a couple of releases.
             // These constants were removed in FreeBSD 11 (svn r273250) but will
             // still be accepted and ignored at runtime.
-            "MAP_RENAME" | "MAP_NORESERVE" => true,
+            "MAP_RENAME" | "MAP_NORESERVE" if Some(10) != freebsd_ver => true,
 
+            // FIXME: There are deprecated - remove in a couple of releases.
             // These constants were removed in FreeBSD 11 (svn r262489),
             // and they've never had any legitimate use outside of the
             // base system anyway.
@@ -1624,64 +1603,40 @@ fn test_freebsd(target: &str) {
     cfg.skip_fn(move |name| {
         // skip those that are manually verified
         match name {
-            // FIXME: still required?
-            "execv" |       // crazy stuff with const/mut
-            "execve" |
-            "execvp" |
-            "execvpe" |
-            "fexecve" => true,
+            // FIXME: https://github.com/rust-lang/libc/issues/1272
+            "execv" | "execve" | "execvp" | "execvpe" | "fexecve" => true,
 
             // The `uname` function in freebsd is now an inline wrapper that
             // delegates to another, but the symbol still exists, so don't check
             // the symbol.
             "uname" => true,
 
-            // aio_waitcomplete's return type changed between FreeBSD 10 and 11.
-            // FIXME: still required?
-            "aio_waitcomplete"  => true,
-
-            // lio_listio confuses the checker, probably because one of its
-            // arguments is an array
-            // FIXME: still required?
+            // FIXME: Our API is unsound. The Rust API allows aliasing
+            // pointers, but the C API requires pointers not to alias.
+            // We should probably be at least using `&`/`&mut` here, see:
+            // https://github.com/gnzlbg/ctest/issues/68
             "lio_listio" => true,
 
             _ => false,
         }
     });
 
-    cfg.skip_field_type(move |struct_, field| {
-        // This is a weird union, don't check the type.
-        // FIXME: still required?
-        (struct_ == "ifaddrs" && field == "ifa_ifu") ||
-        // FIXME: still required?
-        // sighandler_t type is super weird
-            (struct_ == "sigaction" && field == "sa_sigaction") ||
-        // FIXME: still required?
-        // sigval is actually a union, but we pretend it's a struct
-            (struct_ == "sigevent" && field == "sigev_value") ||
-        // aio_buf is "volatile void*" and Rust doesn't understand volatile
-        // FIXME: still required?
-            (struct_ == "aiocb" && field == "aio_buf") ||
-        // stack_t.ss_sp's type changed from FreeBSD 10 to 11 in svn r294930
-        // FIXME: still required?
-            (struct_ == "stack_t" && field == "ss_sp")
+    cfg.volatile_item(|i| {
+        use ctest::VolatileItemKind::*;
+        match i {
+            // aio_buf is a volatile void** but since we cannot express that in
+            // Rust types, we have to explicitly tell the checker about it here:
+            StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf" => {
+                true
+            }
+            _ => false,
+        }
     });
 
     cfg.skip_field(move |struct_, field| {
-        // this is actually a union on linux, so we can't represent it well and
-        // just insert some padding.
-        // FIXME: still required?
-        (struct_ == "siginfo_t" && field == "_pad") ||
-        // sigev_notify_thread_id is actually part of a sigev_un union
-        // FIXME: still required?
-        (struct_ == "sigevent" && field == "sigev_notify_thread_id") ||
-        // signalfd had SIGSYS fields added in Linux 4.18, but no libc release has them yet.
-        // FIXME: still required?
-        (struct_ == "signalfd_siginfo" && (field == "ssi_addr_lsb" ||
-                                           field == "_pad2" ||
-                                           field == "ssi_syscall" ||
-                                           field == "ssi_call_addr" ||
-                                           field == "ssi_arch"))
+        // FIXME: `sa_sigaction` has type `sighandler_t` but that type is
+        // incorrect, see: https://github.com/rust-lang/libc/issues/1359
+        (struct_ == "sigaction" && field == "sa_sigaction")
     });
 
     cfg.generate("../src/lib.rs", "main.rs");

src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs

@@ -25,9 +25,7 @@ s! {
         pub shm_dtime: ::time_t,
         pub shm_ctime: ::time_t,
     }
-}
 
-s_no_extra_traits! {
     pub struct kevent {
         pub ident: ::uintptr_t,
         pub filter: ::c_short,
@@ -37,7 +35,9 @@ s_no_extra_traits! {
         pub udata: *mut ::c_void,
         pub ext: [u64; 4],
     }
+}
 
+s_no_extra_traits! {
     pub struct dirent {
         pub d_fileno: ::ino_t,
         pub d_off: ::off_t,