Add ctest and ctest-test to the root workspace

Now that the structure has been cleaned up, it is possible to add these
crates to the workspace. Since these now get tested in CI by default,
some adjustment of the test script is needed to skip relevant platforms.

`libc-test` depends on `ctest` from crates.io and `ctest-test` depends
on `libc` with a local download. As part of this change, adjust both
cases to use local paths.

Author: tgross35

Cargo.toml

@@ -140,4 +140,8 @@ rustc-dep-of-std = ["rustc-std-workspace-core"]
 extra_traits = []
 
 [workspace]
-members = ["libc-test"]
+members = [
+    "ctest",
+    "ctest-test",
+    "libc-test",
+]

ci/run.sh

@@ -93,6 +93,19 @@ case "$target" in
     *) cmd="$cmd --workspace"
 esac
 
+# garando_errors only compiles on `cfg(any(unix, windows))`
+case "$target" in
+    *wasm*) cmd="$cmd --exclude ctest --exclude ctest-test"
+esac
+
+# # FIXME(ctest): duplicate symbol errors for statics, e.g. T1_static_mut_u8, on Unix-
+# # like platforms.
+# cast "$(uname -s)" in
+#     *windows*msvc) ;;
+#     *apple*) ;;
+#     *) cmd="$cmd --exclude ctest-test" ;;
+# esca
+
 if [ "$target" = "s390x-unknown-linux-gnu" ]; then
     # FIXME: s390x-unknown-linux-gnu often fails to test due to timeout,
     # so we retry this N times.

ctest-test/Cargo.toml

@@ -12,12 +12,7 @@ cc = "1.0"
 
 [dependencies]
 cfg-if = "1.0.0"
-libc = "0.2"
-
-[lib]
-name = "testcrate"
-test = false
-doctest = false
+libc = { path = ".." }
 
 [[bin]]
 name = "t1"

libc-test/Cargo.toml

@@ -24,8 +24,7 @@ annotate-snippets = { version = "0.11.5", features = ["testing-colors"] }
 
 [build-dependencies]
 cc = "1.0.83"
-# FIXME: Use fork ctest until the maintainer gets back.
-ctest2 = "0.4.3"
+ctest = { path = "../ctest" }
 regex = "1.11.1"
 
 [features]

libc-test/build.rs

@@ -1,7 +1,5 @@
 #![deny(warnings)]
 
-extern crate ctest2 as ctest;
-
 use std::fs::File;
 use std::io::{BufRead, BufReader, BufWriter, Write};
 use std::path::{Path, PathBuf};