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 <vdye@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Victoria Dye committed
Aug 12, 2022 at 20:10 UTC
81ad5513431c9c20f3ec41b6713d4ca602ed4a07
1 file changed
+4
-4
contrib/scalar/t/t9099-scalar.sh
+4
-4
@@ -109,14 +109,14 @@ test_expect_success UNZIP 'scalar diagnose' '
109
sed -n "s/.*$SQ\\(.*\\.zip\\)$SQ.*/\\1/p" <err >zip_path &&
110
zip_path=$(cat zip_path) &&
111
test -n "$zip_path" &&
112
- unzip -v "$zip_path" &&
112
+ "$GIT_UNZIP" -v "$zip_path" &&
113
folder=${zip_path%.zip} &&
114
test_path_is_missing "$folder" &&
115
- unzip -p "$zip_path" diagnostics.log >out &&
115
+ "$GIT_UNZIP" -p "$zip_path" diagnostics.log >out &&
116
test_file_not_empty out &&
117
- unzip -p "$zip_path" packs-local.txt >out &&
117
+ "$GIT_UNZIP" -p "$zip_path" packs-local.txt >out &&
118
grep "$(pwd)/.git/objects" out &&
119
- unzip -p "$zip_path" objects-local.txt >out &&
119
+ "$GIT_UNZIP" -p "$zip_path" objects-local.txt >out &&
120
grep "^Total: [1-9]" out
121
'
122