Skip to content

Commit cade73a

Browse files
committed
test(git): Make test backend clearer
1 parent 4e3e353 commit cade73a

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

tests/testsuite/git_shallow.rs

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,27 @@ use cargo_test_support::{basic_manifest, git, paths, project};
44

55
use crate::git_gc::find_index;
66

7+
enum Backend {
8+
Git2,
9+
Gitoxide,
10+
}
11+
712
enum RepoMode {
813
Shallow,
914
Complete,
1015
}
1116

1217
#[cargo_test]
13-
fn gitoxide_clones_shallow_two_revs_same_deps() {
14-
perform_two_revs_same_deps(RepoMode::Shallow)
18+
fn gitoxide_fetch_shallow_two_revs_same_deps() {
19+
fetch_two_revs_same_deps(Backend::Gitoxide, RepoMode::Shallow)
1520
}
1621

1722
#[cargo_test]
18-
fn two_revs_same_deps() {
19-
perform_two_revs_same_deps(RepoMode::Complete)
23+
fn git2_fetch_complete_two_revs_same_deps() {
24+
fetch_two_revs_same_deps(Backend::Git2, RepoMode::Complete)
2025
}
2126

22-
fn perform_two_revs_same_deps(mode: RepoMode) {
27+
fn fetch_two_revs_same_deps(backend: Backend, mode: RepoMode) {
2328
let bar = git::new("meta-dep", |project| {
2429
project
2530
.file("Cargo.toml", &basic_manifest("bar", "0.0.0"))
@@ -97,12 +102,18 @@ fn perform_two_revs_same_deps(mode: RepoMode) {
97102
)
98103
.build();
99104

105+
let backend_args = match backend {
106+
Backend::Git2 => "",
107+
Backend::Gitoxide => "-Zgitoxide=fetch",
108+
};
100109
let mode_args = match mode {
101110
RepoMode::Complete => "",
102-
RepoMode::Shallow => "-Zgitoxide=fetch -Zgit=shallow-deps",
111+
RepoMode::Shallow => "-Zgit=shallow-deps",
103112
};
104113
foo.cargo("check -v")
114+
.arg_line(backend_args)
105115
.arg_line(mode_args)
116+
.env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0") // respect `backend`
106117
.masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
107118
.run();
108119
}

0 commit comments

Comments
 (0)