libc: port apple to use ctest-next

Author: mbyx

ctest-next/src/template.rs

@@ -400,7 +400,7 @@ impl TestTemplate {
                 .as_ref()
                 .is_some_and(|skip| skip(ident))
         };
-        for func in helper.ffi_items.foreign_functions() {
+        for func in helper.filtered_ffi_items.foreign_functions() {
             if should_skip_fn_test(func.ident()) {
                 continue;
             }
@@ -423,7 +423,7 @@ impl TestTemplate {
         &mut self,
         helper: &TranslateHelper,
     ) -> Result<(), TranslationError> {
-        for static_ in helper.ffi_items.foreign_statics() {
+        for static_ in helper.filtered_ffi_items.foreign_statics() {
             let rust_ty = static_.ty.to_token_stream().to_string().into_boxed_str();
 
             let item = TestForeignStatic {

libc-test/Cargo.toml

@@ -34,11 +34,6 @@ name = "ctest"
 path = "test/ctest.rs"
 harness = false
 
-[[test]]
-name = "ctest_next"
-path = "test/ctest_next.rs"
-harness = false
-
 [[test]]
 name = "linux-fcntl"
 path = "test/linux_fcntl.rs"

libc-test/build.rs

@@ -77,7 +77,6 @@ fn ctest_cfg() -> ctest::TestGenerator {
     ctest::TestGenerator::new()
 }
 
-#[expect(unused)]
 fn ctest_next_cfg() -> ctest_next::TestGenerator {
     ctest_next::TestGenerator::new()
 }
@@ -169,14 +168,6 @@ fn main() {
     let re = regex::bytes::Regex::new(r"(?-u:\b)crate::").unwrap();
     copy_dir_hotfix(Path::new("../src"), &hotfix_dir, &re, b"::");
 
-    // FIXME(ctest): Only needed until ctest-next supports all tests.
-    // Provide a default for targets that don't yet use `ctest-next`.
-    std::fs::write(
-        format!("{}/main_next.rs", std::env::var("OUT_DIR").unwrap()),
-        "\nfn main() { println!(\"test result: ok\"); }\n",
-    )
-    .unwrap();
-
     do_cc();
     do_ctest();
     do_semver();
@@ -226,7 +217,8 @@ fn test_apple(target: &str) {
     let x86_64 = target.contains("x86_64");
     let i686 = target.contains("i686");
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_next_cfg();
+    cfg.skip_private(true);
     cfg.flag("-Wno-deprecated-declarations");
     cfg.define("__APPLE_USE_RFC_3542", None);
 
@@ -339,11 +331,14 @@ fn test_apple(target: &str) {
         [x86_64]: "crt_externs.h",
     }
 
-    cfg.skip_struct(move |ty| {
-        if ty.starts_with("__c_anonymous_") {
-            return true;
-        }
-        match ty {
+    // Skip anonymous unions/structs.
+    cfg.skip_union(|u| u.ident().starts_with("__c_anonymous_"));
+    cfg.skip_struct(|s| s.ident().starts_with("__c_anonymous_"));
+
+    cfg.skip_struct(|s| {
+        match s.ident() {
+            // FIXME(union): actually a union
+            "sigval" => true,
             // FIXME(macos): The size is changed in recent macOSes.
             "malloc_zone_t" => true,
             // it is a moving target, changing through versions
@@ -353,16 +348,13 @@ fn test_apple(target: &str) {
             "malloc_introspection_t" => true,
             // sonoma changes the padding `rmx_filler` field.
             "rt_metrics" => true,
-
             _ => false,
         }
     });
 
-    cfg.skip_type(move |ty| {
-        if ty.starts_with("__c_anonymous_") {
-            return true;
-        }
-        match ty {
+    cfg.skip_alias(|ty| ty.ident().starts_with("__c_anonymous_"));
+    cfg.skip_alias(|ty| {
+        match ty.ident() {
             // FIXME(macos): Requires the macOS 14.4 SDK.
             "os_sync_wake_by_address_flags_t" | "os_sync_wait_on_address_flags_t" => true,
 
@@ -373,8 +365,8 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_const(move |name| {
-        match name {
+    cfg.skip_const(move |constant| {
+        match constant.ident() {
             // These OSX constants are removed in Sierra.
             // https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
             "KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
@@ -394,9 +386,9 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_fn(move |name| {
+    cfg.skip_fn(move |func| {
         // skip those that are manually verified
-        match name {
+        match func.ident() {
             // close calls the close_nocancel system call
             "close" => true,
 
@@ -425,8 +417,10 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.skip_field(move |struct_, field| {
-        match (struct_, field) {
+    cfg.skip_struct_field(move |struct_, field| {
+        match (struct_.ident(), field.ident()) {
+            // FIXME(union): actually a union
+            ("sigevent", "sigev_value") => true,
             // FIXME(macos): the array size has been changed since macOS 10.15 ([8] -> [7]).
             ("statfs", "f_reserved") => true,
             ("__darwin_arm_neon_state64", "__v") => true,
@@ -439,39 +433,28 @@ fn test_apple(target: &str) {
         }
     });
 
-    cfg.volatile_item(|i| {
-        use ctest::VolatileItemKind::*;
-        match i {
-            StructField(ref n, ref f) if n == "aiocb" && f == "aio_buf" => true,
-            _ => false,
-        }
-    });
-
-    cfg.type_name(move |ty, is_struct, is_union| {
-        match ty {
-            // Just pass all these through, no need for a "struct" prefix
-            "FILE" | "DIR" | "Dl_info" => ty.to_string(),
-
-            // OSX calls this something else
-            "sighandler_t" => "sig_t".to_string(),
+    cfg.volatile_struct_field(|s, f| s.ident() == "aiocb" && f.ident() == "aio_buf");
 
-            t if is_union => format!("union {t}"),
-            t if t.ends_with("_t") => t.to_string(),
-            t if is_struct => format!("struct {t}"),
-            t => t.to_string(),
-        }
+    cfg.rename_struct_ty(move |ty| {
+        // Just pass all these through, no need for a "struct" prefix
+        ["FILE", "DIR", "Dl_info"]
+            .contains(&ty)
+            .then_some(ty.to_string())
     });
-
-    cfg.field_name(move |struct_, field| {
-        match field {
-            s if s.ends_with("_nsec") && struct_.starts_with("stat") => {
-                s.replace("e_nsec", "espec.tv_nsec")
+    cfg.rename_type(|ty| (ty == "sighandler_t").then_some("sig_t".to_string()));
+    cfg.rename_struct_ty(|ty| ty.ends_with("_t").then_some(ty.to_string()));
+    cfg.rename_union_ty(|ty| ty.ends_with("_t").then_some(ty.to_string()));
+
+    cfg.rename_struct_field(|s, f| {
+        match f.ident() {
+            n if n.ends_with("_nsec") && s.ident().starts_with("stat") => {
+                n.replace("e_nsec", "espec.tv_nsec").into()
             }
             // FIXME(macos): sigaction actually contains a union with two variants:
             // a sa_sigaction with type: (*)(int, struct __siginfo *, void *)
             // a sa_handler with type sig_t
-            "sa_sigaction" if struct_ == "sigaction" => "sa_handler".to_string(),
-            s => s.to_string(),
+            "sa_sigaction" if s.ident() == "sigaction" => "sa_handler".to_string().into(),
+            _ => None,
         }
     });
 
@@ -482,7 +465,8 @@ fn test_apple(target: &str) {
         "uuid_t" | "vol_capabilities_set_t" => true,
         _ => false,
     });
-    cfg.generate(src_hotfix_dir().join("lib.rs"), "ctest_output.rs");
+
+    ctest_next::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
 }
 
 fn test_openbsd(target: &str) {

libc-test/test/ctest_next.rs

@@ -1,5 +1,6 @@
-#[allow(deprecated)]
+#![allow(deprecated)]
+
 #[allow(unused_imports)]
 use libc::*;
 
-include!(concat!(env!("OUT_DIR"), "/main_next.rs"));
+include!(concat!(env!("OUT_DIR"), "/ctest_next.rs"));