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>

diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh
index 080fe5c6dde2227021e7aa959f64258a9cce14c1..5378787e1b23bf18796c28c33533f677b389289c 100755 (executable)
--- a/t/t0024-crlf-archive.sh
+++ b/t/t0024-crlf-archive.sh
@@ -5,6 +5,11 @@ test_description='respect crlf in git archive'
 . ./test-lib.sh
 GIT_UNZIP=${GIT_UNZIP:-unzip}
 
 . ./test-lib.sh
 GIT_UNZIP=${GIT_UNZIP:-unzip}
 

+test_lazy_prereq UNZIP '
+       "$GIT_UNZIP" -v
+       test $? -ne 127
+'
+

 test_expect_success setup '
 
        git config core.autocrlf true &&
 test_expect_success setup '
 
        git config core.autocrlf true &&


@@ -26,13 +31,6 @@ test_expect_success 'tar archive' '
 
 '
 
 
 '
 

-"$GIT_UNZIP" -v >/dev/null 2>&1
-if [ $? -eq 127 ]; then
-       say "Skipping ZIP test, because unzip was not found"
-else
-       test_set_prereq UNZIP
-fi
-

 test_expect_success UNZIP 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&
 test_expect_success UNZIP 'zip archive' '
 
        git archive --format=zip HEAD >test.zip &&

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 1f7593dc7ac1036392191d5a8bb4fd260761ac80..2178f14d11f06d7a0ae60b9928e9f2b1cadae7c0 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -31,6 +31,11 @@ GUNZIP=${GUNZIP:-gzip -d}
 
 SUBSTFORMAT=%H%n
 
 
 SUBSTFORMAT=%H%n
 

+test_lazy_prereq UNZIP '
+       "$GIT_UNZIP" -v
+       test $? -ne 127
+'
+

 check_zip() {
        zipfile=$1.zip
        listfile=$1.lst
 check_zip() {
        zipfile=$1.zip
        listfile=$1.lst


@@ -201,13 +206,6 @@ test_expect_success \
       test_cmp a/substfile2 g/prefix/a/substfile2
 '
 
       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'
 test_expect_success \
     'git archive --format=zip' \
     'git archive --format=zip HEAD >d.zip'