Skip to content

Commit 81ad551

Browse files
vdyegitster
authored andcommitted
scalar-diagnose: use "$GIT_UNZIP" in test
Use the "$GIT_UNZIP" test variable rather than verbatim 'unzip' to unzip the 'scalar diagnose' archive. Using "$GIT_UNZIP" is needed to run the Scalar tests on systems where 'unzip' is not in the system path. Signed-off-by: Victoria Dye <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 350dc9f commit 81ad551

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

contrib/scalar/t/t9099-scalar.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,14 @@ test_expect_success UNZIP 'scalar diagnose' '
109109
sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
110110
zip_path=$(cat zip_path) &&
111111
test -n "$zip_path" &&
112-
unzip -v "$zip_path" &&
112+
"$GIT_UNZIP" -v "$zip_path" &&
113113
folder=${zip_path%.zip} &&
114114
test_path_is_missing "$folder" &&
115-
unzip -p "$zip_path" diagnostics.log >out &&
115+
"$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
116116
test_file_not_empty out &&
117-
unzip -p "$zip_path" packs-local.txt >out &&
117+
"$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
118118
grep "$(pwd)/.git/objects" out &&
119-
unzip -p "$zip_path" objects-local.txt >out &&
119+
"$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
120120
grep "^Total: [1-9]" out
121121
'
122122

0 commit comments

Comments
 (0)