Skip to content

Commit 3cc9c3c

Browse files
authored
Merge pull request #969 from weihanglo/ctest2
chore: switch from ctest to ctest2
2 parents d6d3c0b + 1a6e0a1 commit 3cc9c3c

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/main.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,8 @@ jobs:
3131
shell: bash
3232
- run: cargo test --no-default-features
3333
- run: cargo test
34-
# skip systest on nightly because it requires the extprim crate which fails to compile on nightly rust
35-
- run: if [[ "${{ matrix.rust }}" != "nightly" ]]; then cargo run --manifest-path systest/Cargo.toml; fi
36-
shell: bash
37-
- run: cargo test --manifest-path git2-curl/Cargo.toml
34+
- run: cargo run -p systest
35+
- run: cargo test -p git2-curl
3836

3937
rustfmt:
4038
name: Rustfmt

systest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ libgit2-sys = { path = "../libgit2-sys", features = ['https', 'ssh'] }
1010
libc = "0.2"
1111

1212
[build-dependencies]
13-
ctest = "0.2.17"
13+
ctest2 = "0.4"

systest/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::env;
22
use std::path::PathBuf;
33

44
fn main() {
5-
let mut cfg = ctest::TestGenerator::new();
5+
let mut cfg = ctest2::TestGenerator::new();
66
if let Some(root) = env::var_os("DEP_GIT2_ROOT") {
77
cfg.include(PathBuf::from(root).join("include"));
88
}

0 commit comments

Comments
 (0)