diff options
| -rwxr-xr-x | t/t0024-crlf-archive.sh | 12 | ||||
| -rwxr-xr-x | t/t5000-tar-tree.sh | 12 |
2 files changed, 10 insertions, 14 deletions
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh index 080fe5c6dd..5378787e1b 100755 --- 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_lazy_prereq UNZIP ' + "$GIT_UNZIP" -v + test $? -ne 127 +' + 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 && 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' |