promote ctest-next to ctest

(backport <#4655>)
(cherry picked from commit 4439546)
[ drop everything related to the actual ctest-next impl. Some other
  Cargo.toml adjustments were needed. - Trevor ]

Author: mbyx

Cargo.lock

@@ -149,7 +149,6 @@ use_std = ['std']
 [workspace]
 members = [
     "ctest",
-    "ctest-next",
     "libc-test",
 ]
 

Cargo.toml

@@ -5,6 +5,7 @@
 name = "ctest"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.77"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/rust-lang/libc"
 publish = false
-
-[dependencies]

ctest-next/Cargo.toml

@@ -20,10 +20,9 @@ annotate-snippets = { version = "0.11.5", features = ["testing-colors"] }
 
 [build-dependencies]
 cc = "1.2.29"
-# FIXME: Use fork ctest until the maintainer gets back.
-ctest-old = { version = "0.4.3", package = "ctest2" }
+ctest-old = { version = "0.4.11", package = "ctest" }
 # Use the in-tree `ctest` from the `main` branch via crates.io
-ctest-next = { version = "0.5.0-beta.0", package = "ctest" }
+ctest = "0.5.0-beta.0"
 regex = "1.11.1"
 
 [features]

ctest-next/src/lib.rs

@@ -73,17 +73,16 @@ fn do_ctest() {
     }
 }
 
-fn ctest_cfg() -> ctest_old::TestGenerator {
+fn ctest_old_cfg() -> ctest_old::TestGenerator {
     let mut cfg = ctest_old::TestGenerator::new();
     let libc_cfgs = ["libc_thread_local"];
     for f in &libc_cfgs {
         cfg.cfg(f, None);
     }
     cfg
 }
-
-fn ctest_next_cfg() -> ctest_next::TestGenerator {
-    let mut cfg = ctest_next::TestGenerator::new();
+fn ctest_cfg() -> ctest::TestGenerator {
+    let mut cfg = ctest::TestGenerator::new();
     cfg.skip_private(true);
     let libc_cfgs = ["libc_thread_local"];
     for f in &libc_cfgs {
@@ -228,7 +227,7 @@ fn test_apple(target: &str) {
     let x86_64 = target.contains("x86_64");
     let i686 = target.contains("i686");
 
-    let mut cfg = ctest_next_cfg();
+    let mut cfg = ctest_cfg();
 
     cfg.flag("-Wno-deprecated-declarations");
     cfg.define("__APPLE_USE_RFC_3542", None);
@@ -500,13 +499,13 @@ fn test_apple(target: &str) {
         _ => false,
     });
 
-    ctest_next::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
+    ctest::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
 }
 
 fn test_openbsd(target: &str) {
     assert!(target.contains("openbsd"));
 
-    let mut cfg = ctest_next_cfg();
+    let mut cfg = ctest_cfg();
     cfg.flag("-Wno-deprecated-declarations");
 
     let x86_64 = target.contains("x86_64");
@@ -701,13 +700,13 @@ fn test_openbsd(target: &str) {
         }
     });
 
-    ctest_next::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
+    ctest::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
 }
 
 fn test_cygwin(target: &str) {
     assert!(target.contains("cygwin"));
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.define("_GNU_SOURCE", None);
 
     headers! { cfg:
@@ -881,7 +880,7 @@ fn test_windows(target: &str) {
     let gnu = target.contains("gnu");
     let i686 = target.contains("i686");
 
-    let mut cfg = ctest_next_cfg();
+    let mut cfg = ctest_cfg();
 
     if target.contains("msvc") {
         cfg.flag("/wd4324");
@@ -998,13 +997,13 @@ fn test_windows(target: &str) {
         }
     });
 
-    ctest_next::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
+    ctest::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
 }
 
 fn test_redox(target: &str) {
     assert!(target.contains("redox"));
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.flag("-Wno-deprecated-declarations");
 
     headers! {
@@ -1058,7 +1057,7 @@ fn test_solarish(target: &str) {
 
     // ctest generates arguments supported only by clang, so make sure to run with CC=clang.
     // While debugging, "CFLAGS=-ferror-limit=<large num>" is useful to get more error output.
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.flag("-Wno-deprecated-declarations");
 
     cfg.define("_XOPEN_SOURCE", Some("700"));
@@ -1343,7 +1342,7 @@ fn test_solarish(target: &str) {
 
 fn test_netbsd(target: &str) {
     assert!(target.contains("netbsd"));
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
 
     cfg.flag("-Wno-deprecated-declarations");
     cfg.define("_NETBSD_SOURCE", Some("1"));
@@ -1559,7 +1558,7 @@ fn test_netbsd(target: &str) {
 
 fn test_dragonflybsd(target: &str) {
     assert!(target.contains("dragonfly"));
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.flag("-Wno-deprecated-declarations");
 
     headers! {
@@ -1786,7 +1785,7 @@ fn test_wasi(target: &str) {
     assert!(target.contains("wasi"));
     let p2 = target.contains("wasip2");
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.define("_GNU_SOURCE", None);
 
     headers! { cfg:
@@ -1899,7 +1898,7 @@ fn test_android(target: &str) {
     let x86 = target.contains("i686") || target.contains("x86_64");
     let aarch64 = target.contains("aarch64");
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.define("_GNU_SOURCE", None);
 
     headers! { cfg:
@@ -2400,7 +2399,7 @@ fn test_android(target: &str) {
 
 fn test_freebsd(target: &str) {
     assert!(target.contains("freebsd"));
-    let mut cfg = ctest_next_cfg();
+    let mut cfg = ctest_cfg();
 
     let freebsd_ver = which_freebsd();
 
@@ -3081,13 +3080,13 @@ fn test_freebsd(target: &str) {
     // FIXME(ctest): The original ctest bypassed this requirement somehow.
     cfg.rename_type(move |ty| (ty == "dot3Vendors").then_some(format!("enum {ty}")));
 
-    ctest_next::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
+    ctest::generate_test(&mut cfg, "../src/lib.rs", "ctest_output.rs").unwrap();
 }
 
 fn test_emscripten(target: &str) {
     assert!(target.contains("emscripten"));
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.define("_GNU_SOURCE", None); // FIXME(emscripten): ??
 
     headers! { cfg:
@@ -3327,7 +3326,7 @@ fn test_emscripten(target: &str) {
 fn test_neutrino(target: &str) {
     assert!(target.contains("nto-qnx"));
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     if target.ends_with("_iosock") {
         let qnx_target_val = env::var("QNX_TARGET")
             .unwrap_or_else(|_| "QNX_TARGET_not_set_please_source_qnxsdp".into());
@@ -3773,7 +3772,7 @@ fn test_linux(target: &str) {
     let musl_v1_2_3 = env::var("RUST_LIBC_UNSTABLE_MUSL_V1_2_3").is_ok();
     let old_musl = musl && !musl_v1_2_3;
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     if musl_v1_2_3 {
         cfg.cfg("musl_v1_2_3", None);
     }
@@ -5039,7 +5038,7 @@ fn test_linux_like_apis(target: &str) {
 
     if linux || android || emscripten {
         // test strerror_r from the `string.h` header
-        let mut cfg = ctest_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
         cfg.skip_type(|_| true).skip_static(|_| true);
 
@@ -5056,7 +5055,7 @@ fn test_linux_like_apis(target: &str) {
     if linux || android || emscripten {
         // test fcntl - see:
         // http://man7.org/linux/man-pages/man2/fcntl.2.html
-        let mut cfg = ctest_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
 
         if musl {
@@ -5086,7 +5085,7 @@ fn test_linux_like_apis(target: &str) {
 
     if (linux && !wali) || android {
         // test termios
-        let mut cfg = ctest_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
         cfg.header("asm/termbits.h");
         cfg.header("linux/termios.h");
@@ -5111,7 +5110,7 @@ fn test_linux_like_apis(target: &str) {
 
     if linux || android {
         // test IPV6_ constants:
-        let mut cfg = ctest_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
         headers! {
             cfg:
@@ -5143,7 +5142,7 @@ fn test_linux_like_apis(target: &str) {
         // 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_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
         cfg.header("elf.h");
         cfg.skip_fn(|_| true)
@@ -5163,7 +5162,7 @@ fn test_linux_like_apis(target: &str) {
 
     if (linux && !wali) || android {
         // Test `ARPHRD_CAN`.
-        let mut cfg = ctest_cfg();
+        let mut cfg = ctest_old_cfg();
         config_gnu_bits(target, &mut cfg);
         cfg.header("linux/if_arp.h");
         cfg.skip_fn(|_| true)
@@ -5209,7 +5208,7 @@ fn which_freebsd() -> Option<i32> {
 fn test_haiku(target: &str) {
     assert!(target.contains("haiku"));
 
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.flag("-Wno-deprecated-declarations");
     cfg.define("__USE_GNU", Some("1"));
     cfg.define("_GNU_SOURCE", None);
@@ -5548,7 +5547,7 @@ fn test_aix(target: &str) {
     // ctest generates arguments supported only by clang, so make sure to
     // run with CC=clang. While debugging, "CFLAGS=-ferror-limit=<large num>"
     // is useful to get more error output.
-    let mut cfg = ctest_cfg();
+    let mut cfg = ctest_old_cfg();
     cfg.define("_THREAD_SAFE", None);
 
     // Avoid the error for definitions such as '{0, 0, 0, 1}' for