WIP: re-enable tests for Elf64_Phdr

Author: gnzlbg

libc-test/build.rs

@@ -2473,8 +2473,8 @@ fn test_linux(target: &str) {
             // FIXME: is this necessary?
             "sighandler_t" => true,
 
-            // FIXME: these types have a p_type member but some header
-            // has a define p_type __p_type macro that breaks their tests:
+            // These cannot be tested when "resolv.h" is included and are tested
+            // below.
             "Elf64_Phdr" | "Elf32_Phdr" => true,
 
             _ => false,
@@ -2486,8 +2486,8 @@ fn test_linux(target: &str) {
             // FIXME: is this necessary?
             "sockaddr_nl" if musl => true,
 
-            // FIXME: these types have a p_type member but some header
-            // has a define p_type __p_type macro that breaks their tests:
+            // These cannot be tested when "resolv.h" is included and are tested
+            // below.
             "Elf64_Phdr" | "Elf32_Phdr" => true,
 
             // On Linux, the type of `ut_tv` field of `struct utmpx`
@@ -2818,4 +2818,27 @@ fn test_linux(target: &str) {
         t => t.to_string(),
     });
     cfg.generate("../src/lib.rs", "linux_fcntl.rs");
+
+    // Test Elf64_Phdr and Elf32_Phdr
+    // These types have a field called `p_type`, but including
+    // "resolve.h" defines a `p_type` macro that expands to `__p_type`
+    // making the tests for these fails when both are included.
+    let mut cfg = ctest::TestGenerator::new();
+    cfg.skip_fn(|_| true)
+        .skip_const(|_| true)
+        .skip_static(|_| true);
+    cfg.skip_struct(move |ty| {
+        match ty {
+            "Elf64_Phdr" | "Elf32_Phdr" => false,
+            _ => true,
+        }
+    });
+    cfg.skip_type(move |ty| {
+        match ty {
+            "Elf64_Phdr" | "Elf32_Phdr" => false,
+            _ => true,
+        }
+    });
+    cfg.header("linux/elf.h");
+    cfg.generate("../src/lib.rs", "linux_elf.rs");
 }