summaryrefslogtreecommitdiff
path: root/t/t5000-tar-tree.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-12-17 19:46:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-12-17 19:46:30 (GMT)
commitaa13132d9068d77af0b1d8e2cfbf93cda4f09226 (patch)
treeeef509cecc130f1ae2e6f3f156fdbf4e6fb7accc /t/t5000-tar-tree.sh
parentf9633716d0873b7d9173be2be603d5edec0a27d7 (diff)
parent96174145fc34c584e1e769eae455a92ebbfea735 (diff)
downloadgit-aa13132d9068d77af0b1d8e2cfbf93cda4f09226.zip
git-aa13132d9068d77af0b1d8e2cfbf93cda4f09226.tar.gz
git-aa13132d9068d77af0b1d8e2cfbf93cda4f09226.tar.bz2
Merge branch 'jk/t5000-gzip-simplify'
Test fix. * jk/t5000-gzip-simplify: t5000: simplify gzip prerequisite checks
Diffstat (limited to 't/t5000-tar-tree.sh')
-rwxr-xr-xt/t5000-tar-tree.sh20
1 files changed, 4 insertions, 16 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 11bf0b8..05f011d 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -25,8 +25,6 @@ commit id embedding:
'
. ./test-lib.sh
-GZIP=${GZIP:-gzip}
-GUNZIP=${GUNZIP:-gzip -d}
SUBSTFORMAT=%H%n
@@ -39,6 +37,8 @@ test_lazy_prereq TAR_NEEDS_PAX_FALLBACK '
)
'
+test_lazy_prereq GZIP 'gzip --version'
+
get_pax_header() {
file=$1
header=$2=
@@ -265,12 +265,6 @@ test_expect_success 'only enabled filters are available remotely' '
test_cmp remote.bar config.bar
'
-if $GZIP --version >/dev/null 2>&1; then
- test_set_prereq GZIP
-else
- say "Skipping some tar.gz tests because gzip not found"
-fi
-
test_expect_success GZIP 'git archive --format=tgz' '
git archive --format=tgz HEAD >j.tgz
'
@@ -290,14 +284,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
-else
- say "Skipping some tar.gz tests because gunzip was not found"
-fi
-
-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
'