Merge pull request #969 from weihanglo/ctest2

chore: switch from ctest to ctest2
rust-lang · Jul 23, 2023 · 3cc9c3c · 3cc9c3c
2 parents d6d3c0b + 1a6e0a1
commit 3cc9c3c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,10 +31,8 @@ jobs:
       shell: bash
     - run: cargo test --no-default-features
     - run: cargo test
-    # skip systest on nightly because it requires the extprim crate which fails to compile on nightly rust
-    - run: if [[ "${{ matrix.rust }}" != "nightly" ]]; then cargo run --manifest-path systest/Cargo.toml; fi
-      shell: bash
-    - run: cargo test --manifest-path git2-curl/Cargo.toml
+    - run: cargo run -p systest
+    - run: cargo test -p git2-curl
 
   rustfmt:
     name: Rustfmt

diff --git a/systest/Cargo.toml b/systest/Cargo.toml
@@ -10,4 +10,4 @@ libgit2-sys = { path = "../libgit2-sys", features = ['https', 'ssh'] }
 libc = "0.2"
 
 [build-dependencies]
-ctest = "0.2.17"
+ctest2 = "0.4"
diff --git a/systest/build.rs b/systest/build.rs
@@ -2,7 +2,7 @@ use std::env;
 use std::path::PathBuf;
 
 fn main() {
-    let mut cfg = ctest::TestGenerator::new();
+    let mut cfg = ctest2::TestGenerator::new();
     if let Some(root) = env::var_os("DEP_GIT2_ROOT") {
         cfg.include(PathBuf::from(root).join("include"));
     }