Remove the libc_ctest feature

This was a workaround for the old ctest not being able to parse
something related to the `addr_of!` macros in statics referencing
statics. This is not needed with the new ctest; thus, remove the config.

Author: tgross35

build.rs

@@ -18,7 +18,6 @@ const ALLOWED_CFGS: &[&str] = &[
     // Corresponds to `_TIME_BITS=64` in glibc
     "gnu_time_bits64",
     "libc_deny_warnings",
-    "libc_ctest",
     // Corresponds to `__USE_TIME_BITS64` in UAPI
     "linux_time_bits64",
     "musl_v1_2_3",

libc-test/build.rs

@@ -1694,11 +1694,6 @@ fn test_wasi(target: &str) {
         "wchar.h",
     }
 
-    // Currently `ctest` doesn't support macros-in-static-expressions and will
-    // panic on them. That affects `CLOCK_*` defines in wasi to set this here
-    // to omit them.
-    cfg.cfg("libc_ctest", None);
-
     cfg.rename_struct_ty(move |ty| match ty {
         "FILE" | "fd_set" | "DIR" => Some(ty.to_string()),
         t if t.ends_with("_t") => Some(t.to_string()),

src/wasi/mod.rs

@@ -361,26 +361,17 @@ pub const _SC_PAGE_SIZE: c_int = _SC_PAGESIZE;
 pub const _SC_IOV_MAX: c_int = 60;
 pub const _SC_SYMLOOP_MAX: c_int = 173;
 
-cfg_if! {
-    if #[cfg(libc_ctest)] {
-        // skip these constants when this is active because `ctest` currently
-        // panics on parsing the constants below
-    } else {
-        // unsafe code here is required in the stable, but not in nightly
-        #[allow(unused_unsafe)]
-        pub static CLOCK_MONOTONIC: clockid_t =
-            unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_MONOTONIC)) };
-        #[allow(unused_unsafe)]
-        pub static CLOCK_PROCESS_CPUTIME_ID: clockid_t =
-            unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_PROCESS_CPUTIME_ID)) };
-        #[allow(unused_unsafe)]
-        pub static CLOCK_REALTIME: clockid_t =
-            unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_REALTIME)) };
-        #[allow(unused_unsafe)]
-        pub static CLOCK_THREAD_CPUTIME_ID: clockid_t =
-            unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_THREAD_CPUTIME_ID)) };
-    }
-}
+// unsafe code here is required in the stable, but not in nightly
+#[allow(unused_unsafe)]
+pub static CLOCK_MONOTONIC: clockid_t = unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_MONOTONIC)) };
+#[allow(unused_unsafe)]
+pub static CLOCK_PROCESS_CPUTIME_ID: clockid_t =
+    unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_PROCESS_CPUTIME_ID)) };
+#[allow(unused_unsafe)]
+pub static CLOCK_REALTIME: clockid_t = unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_REALTIME)) };
+#[allow(unused_unsafe)]
+pub static CLOCK_THREAD_CPUTIME_ID: clockid_t =
+    unsafe { clockid_t(core::ptr::addr_of!(_CLOCK_THREAD_CPUTIME_ID)) };
 
 pub const ABDAY_1: crate::nl_item = 0x20000;
 pub const ABDAY_2: crate::nl_item = 0x20001;