remove ctest-old from ctest-test

Author: mbyx

ctest-test/Cargo.toml

@@ -7,15 +7,12 @@ edition = "2021"
 
 [build-dependencies]
 ctest = { path = "../ctest" }
-ctest-next = { path = "../ctest-next" }
 cc = "1.2"
 
 [dev-dependencies]
 ctest = { path = "../ctest" }
-ctest-next = { path = "../ctest-next" }
 
 [dependencies]
-cfg-if = "1.0.1"
 libc = { path = ".." }
 
 [[bin]]
@@ -26,22 +23,6 @@ test = false
 name = "t2"
 test = false
 
-[[bin]]
-name = "t1_next"
-test = false
-
-[[bin]]
-name = "t2_next"
-test = false
-
-[[bin]]
-name = "t1_cxx"
-test = false
-
-[[bin]]
-name = "t2_cxx"
-test = false
-
 # FIXME(msrv): These should be moved to the root Cargo.toml as `[workspace.lints.*]`
 #              once MSRV is above 1.64 and replaced with `[lints] workspace=true`
 

ctest-test/build.rs

@@ -1,5 +1,3 @@
-use std::process::Command;
-
 fn main() {
     use std::env;
     let opt_level = env::var("OPT_LEVEL")
@@ -12,88 +10,11 @@ fn main() {
     }
 
     do_cc();
-    test_ctest_c();
-    test_ctest_cpp();
-    test_ctest_next();
-}
-
-fn test_ctest_c() {
-    ctest::TestGenerator::new()
-        .header("t1.h")
-        .include("src")
-        .fn_cname(|a, b| b.unwrap_or(a).to_string())
-        .type_name(move |ty, is_struct, is_union| match ty {
-            "T1Union" => ty.to_string(),
-            "Transparent" => ty.to_string(),
-            t if is_struct => format!("struct {t}"),
-            t if is_union => format!("union {t}"),
-            t => t.to_string(),
-        })
-        .volatile_item(t1_volatile)
-        .array_arg(t1_arrays)
-        .skip_roundtrip(|n| n == "Arr")
-        .skip_const(|name| name == "T1S")
-        .generate("src/t1.rs", "t1gen.rs");
-
-    ctest::TestGenerator::new()
-        .header("t2.h")
-        .include("src")
-        .skip_const(|name| name == "T2S")
-        .type_name(move |ty, is_struct, is_union| match ty {
-            "T2Union" => ty.to_string(),
-            t if is_struct => format!("struct {t}"),
-            t if is_union => format!("union {t}"),
-            t => t.to_string(),
-        })
-        .skip_roundtrip(|_| true)
-        .generate("src/t2.rs", "t2gen.rs");
-}
-
-fn test_ctest_cpp() {
-    println!("cargo::rustc-check-cfg=cfg(has_cxx)");
-    if !cfg!(unix) || Command::new("c++").arg("v").output().is_ok() {
-        // A C compiler is always available, but these are only run if a C++ compiler is
-        // also available.
-        println!("cargo::rustc-cfg=has_cxx");
-
-        ctest::TestGenerator::new()
-            .header("t1.h")
-            .language(ctest::Lang::CXX)
-            .include("src")
-            .fn_cname(|a, b| b.unwrap_or(a).to_string())
-            .type_name(move |ty, is_struct, is_union| match ty {
-                "T1Union" => ty.to_string(),
-                "Transparent" => ty.to_string(),
-                t if is_struct => format!("struct {t}"),
-                t if is_union => format!("union {t}"),
-                t => t.to_string(),
-            })
-            .skip_const(|name| name == "T1S")
-            .volatile_item(t1_volatile)
-            .array_arg(t1_arrays)
-            .skip_roundtrip(|n| n == "Arr")
-            .generate("src/t1.rs", "t1gen_cxx.rs");
-
-        ctest::TestGenerator::new()
-            .header("t2.h")
-            .language(ctest::Lang::CXX)
-            .include("src")
-            .skip_const(|name| name == "T2S")
-            .type_name(move |ty, is_struct, is_union| match ty {
-                "T2Union" => ty.to_string(),
-                t if is_struct => format!("struct {t}"),
-                t if is_union => format!("union {t}"),
-                t => t.to_string(),
-            })
-            .skip_roundtrip(|_| true)
-            .generate("src/t2.rs", "t2gen_cxx.rs");
-    } else {
-        println!("cargo::warning=skipping C++ tests");
-    }
+    test_ctest();
 }
 
-fn test_ctest_next() {
-    let mut t1gen = ctest_next::TestGenerator::new();
+fn test_ctest() {
+    let mut t1gen = ctest::TestGenerator::new();
     t1gen
         .header("t1.h")
         .include("src")
@@ -112,17 +33,17 @@ fn test_ctest_next() {
         // The parameter `a` of the functions `T1r`, `T1s`, `T1t`, `T1v` is an array.
         .array_arg(|f, p| matches!(f.ident(), "T1r" | "T1s" | "T1t" | "T1v") && p.ident() == "a")
         .skip_roundtrip(|n| n == "Arr");
-    ctest_next::generate_test(&mut t1gen, "src/t1.rs", "t1nextgen.rs").unwrap();
+    ctest::generate_test(&mut t1gen, "src/t1.rs", "t1gen.rs").unwrap();
 
-    let mut t2gen = ctest_next::TestGenerator::new();
+    let mut t2gen = ctest::TestGenerator::new();
     t2gen
         .header("t2.h")
         .include("src")
         // public C typedefs have to manually be specified because they are identical to normal
         // structs on the Rust side.
         .rename_union_ty(|ty| (ty == "T2Union").then_some(ty.to_string()))
         .skip_roundtrip(|_| true);
-    ctest_next::generate_test(&mut t2gen, "src/t2.rs", "t2nextgen.rs").unwrap();
+    ctest::generate_test(&mut t2gen, "src/t2.rs", "t2gen.rs").unwrap();
 }
 
 fn do_cc() {
@@ -140,20 +61,3 @@ fn do_cc() {
     println!("cargo:rerun-if-changed=src/t2.c");
     println!("cargo:rerun-if-changed=src/t2.h");
 }
-
-fn t1_volatile(i: ctest::VolatileItemKind) -> bool {
-    use ctest::VolatileItemKind::*;
-    match i {
-        StructField(ref n, ref f) if n == "V" && f == "v" => true,
-        Static(ref n) if n == "vol_ptr" => true,
-        FunctionArg(ref n, 0) if n == "T1_vol0" => true,
-        FunctionArg(ref n, 1) if n == "T1_vol2" => true,
-        FunctionRet(ref n) if n == "T1_vol1" || n == "T1_vol2" => true,
-        Static(ref n) if n == "T1_fn_ptr_vol" => true,
-        _ => false,
-    }
-}
-
-fn t1_arrays(n: &str, i: usize) -> bool {
-    i == 0 && matches!(n, "T1r" | "T1s" | "T1t" | "T1v")
-}

ctest-test/src/bin/t1.rs

@@ -1,8 +1,6 @@
 #![cfg(not(test))]
 #![deny(warnings)]
 
-use std::ffi::c_uint;
-
 use ctest_test::t1::*;
 
 include!(concat!(env!("OUT_DIR"), "/t1gen.rs"));