path: root/t/
diff options
authorJeff King <>2013-12-03 13:21:40 (GMT)
committerJunio C Hamano <>2013-12-05 00:11:53 (GMT)
commit96174145fc34c584e1e769eae455a92ebbfea735 (patch)
treeb733971018859229b9941fcd02a8d3e130ff27c3 /t/
parenta155a5f075cdc09e584a58d68bdce0c80e6c4b5a (diff)
t5000: simplify gzip prerequisite checks
In t5000, we test the built-in ".tar.gz" config for git-archive. To make our tests portable, we check that we have a way to both gzip and gunzip, and we respected environment variables to point to alternate commands for doing these operations. However, the $GZIP variable did not actually do anything, as changing it would not affect the baked-in value in archive-tar.c. Moreover, setting the variable $GZIP influences gzip itself. From the gzip man page: The environment variable GZIP can hold a set of default options for gzip. These options are interpreted first and can be overwritten by explicit command line parameters. We could rename this variable, and use it to set up custom config (or even have a Makefile knob to affect the built binary), but it is not worth the trouble; nobody has ever reported a problem with the baked-in default, and they can always change it via config if they need to. Let's just drop the variable and use "gzip" in the test (keeping the prerequisite, of course). While we're at it, we can drop the GUNZIP variable and prerequisite; it uses "gzip -d", so if we have GZIP, we will have both. We can also use test_lazy_prereq for the gzip prerequisite, which is simpler and behaves more consistently with the rest of git (e.g., by making output available when the test is run with "-v"). Noticed-by: Christian Hesse <> Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 4 insertions, 16 deletions
diff --git a/t/ b/t/
index c2023b1..519cc34 100755
--- a/t/
+++ b/t/
@@ -25,8 +25,6 @@ commit id embedding:
. ./
-GUNZIP=${GUNZIP:-gzip -d}
@@ -39,6 +37,8 @@ test_lazy_prereq TAR_NEEDS_PAX_FALLBACK '
+test_lazy_prereq GZIP 'gzip --version'
get_pax_header() {
@@ -275,12 +275,6 @@ test_expect_success 'only enabled filters are available remotely' '
-if $GZIP --version >/dev/null 2>&1; then
- test_set_prereq GZIP
- say "Skipping some tar.gz tests because gzip not found"
test_expect_success GZIP 'git archive --format=tgz' '
git archive --format=tgz HEAD >j.tgz
@@ -300,14 +294,8 @@ test_expect_success GZIP 'infer tgz from .tar.gz filename' '
test_cmp j.tgz j3.tar.gz
-if $GUNZIP --version >/dev/null 2>&1; then
- test_set_prereq GUNZIP
- say "Skipping some tar.gz tests because gunzip was not found"
-test_expect_success GZIP,GUNZIP 'extract tgz file' '
- $GUNZIP -c <j.tgz >j.tar &&
+test_expect_success GZIP 'extract tgz file' '
+ gzip -d -c <j.tgz >j.tar &&
test_cmp b.tar j.tar