Merge pull request #12 from rust-lang/master

Sync to rust-lang/libc branch master
rust-lang · Sep 20, 2019 · 5dd6292 · 5dd6292
2 parents ea0a512 + c443f1a
commit 5dd6292
Showing 1 changed file with 5 additions and 49 deletions.
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -225,12 +225,6 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_roundtrip(move |s| match s {
-        // FIXME: TODO
-        "utsname" | "statfs" | "dirent" | "utmpx" => true,
-        _ => false,
-    });
-
     cfg.generate("../src/lib.rs", "main.rs");
 }
 
@@ -370,11 +364,6 @@ fn test_openbsd(target: &str) {
         (struct_ == "siginfo_t" && field == "si_addr")
     });
 
-    cfg.skip_roundtrip(move |s| match s {
-        "dirent" | "utsname" | "utmp" => true,
-        _ => false,
-    });
-
     cfg.generate("../src/lib.rs", "main.rs");
 }
 
@@ -479,11 +468,6 @@ fn test_windows(target: &str) {
         }
     });
 
-    cfg.skip_roundtrip(move |s| match s {
-        "dirent" | "statfs" | "utsname" | "utmpx" => true,
-        _ => false,
-    });
-
     cfg.generate("../src/lib.rs", "main.rs");
 }
 
@@ -1438,13 +1422,6 @@ fn test_android(target: &str) {
                                            field == "ssi_arch"))
     });
 
-    let bit64 = target.contains("64");
-    cfg.skip_roundtrip(move |s| match s {
-        "utsname" | "dirent" | "dirent64" => true,
-        "utmp" if bit64 => true,
-        _ => false,
-    });
-
     cfg.generate("../src/lib.rs", "main.rs");
 
     test_linux_like_apis(target);
@@ -1648,11 +1625,6 @@ fn test_freebsd(target: &str) {
         (struct_ == "sigaction" && field == "sa_sigaction")
     });
 
-    cfg.skip_roundtrip(move |s| match s {
-        "dirent" | "statfs" | "utsname" | "utmpx" => true,
-        _ => false,
-    });
-
     cfg.generate("../src/lib.rs", "main.rs");
 }
 
@@ -1857,15 +1829,6 @@ fn test_emscripten(target: &str) {
                                            field == "ssi_arch"))
     });
 
-    cfg.skip_roundtrip(move |s| match s {
-        "pthread_mutexattr_t"
-        | "utsname"
-        | "dirent"
-        | "dirent64"
-        | "sysinfo" => true,
-        _ => false,
-    });
-
     // FIXME: test linux like
     cfg.generate("../src/lib.rs", "main.rs");
 }
@@ -2291,17 +2254,11 @@ fn test_linux(target: &str) {
     });
 
     cfg.skip_roundtrip(move |s| match s {
-        // FIXME: TODO
-        "_libc_fpstate" | "user_fpregs_struct" if x86_64 => true,
-        "utsname"
-        | "statx"
-        | "dirent"
-        | "dirent64"
-        | "utmpx"
-        | "user"
-        | "user_fpxregs_struct" => true,
-        "sysinfo" if musl => true,
-        "ucontext_t" if x86_64 && musl => true,
+        // FIXME:
+        "utsname" if mips32 || mips64 => true,
+        // FIXME:
+        "mcontext_t" if s390x => true,
+
         "sockaddr_un" | "sembuf" | "ff_constant_effect"
             if mips32 && (gnu || musl) =>
         {
@@ -2328,7 +2285,6 @@ fn test_linux(target: &str) {
         {
             true
         }
-        "mcontext_t" if s390x => true,
 
         _ => false,
     });