diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2013-01-06 18:49:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-07 08:47:51 -0800 |
| commit | 25d3d323633dbf3b8e8fbe209c9054196a202cf7 (patch) | |
| tree | 0963e7b7141e65665e900b8750835c5907c280fe /t/t5000-tar-tree.sh | |
| parent | ac00128298583bcdd42bffc767393868821b6af6 (diff) | |
| download | git-25d3d323633dbf3b8e8fbe209c9054196a202cf7.tar.gz | |
t0024, t5000: use test_lazy_prereq for UNZIP
This change makes the code smaller and we can put it at the top of
the script, its rightful place as setup code.
Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5000-tar-tree.sh')
| -rwxr-xr-x | t/t5000-tar-tree.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 1f7593dc7a..2178f14d11 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -31,6 +31,11 @@ GUNZIP=${GUNZIP:-gzip -d} SUBSTFORMAT=%H%n +test_lazy_prereq UNZIP ' + "$GIT_UNZIP" -v + test $? -ne 127 +' + check_zip() { zipfile=$1.zip listfile=$1.lst @@ -201,13 +206,6 @@ test_expect_success \ test_cmp a/substfile2 g/prefix/a/substfile2 ' -"$GIT_UNZIP" -v >/dev/null 2>&1 -if [ $? -eq 127 ]; then - say "Skipping ZIP tests, because unzip was not found" -else - test_set_prereq UNZIP -fi - test_expect_success \ 'git archive --format=zip' \ 'git archive --format=zip HEAD >d.zip' |