mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
ac00128298
commit
25d3d32363
|
@ -5,6 +5,11 @@ test_description='respect crlf in git archive'
|
||||||
. ./test-lib.sh
|
. ./test-lib.sh
|
||||||
GIT_UNZIP=${GIT_UNZIP:-unzip}
|
GIT_UNZIP=${GIT_UNZIP:-unzip}
|
||||||
|
|
||||||
|
test_lazy_prereq UNZIP '
|
||||||
|
"$GIT_UNZIP" -v
|
||||||
|
test $? -ne 127
|
||||||
|
'
|
||||||
|
|
||||||
test_expect_success setup '
|
test_expect_success setup '
|
||||||
|
|
||||||
git config core.autocrlf true &&
|
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' '
|
test_expect_success UNZIP 'zip archive' '
|
||||||
|
|
||||||
git archive --format=zip HEAD >test.zip &&
|
git archive --format=zip HEAD >test.zip &&
|
||||||
|
|
|
@ -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() {
|
check_zip() {
|
||||||
zipfile=$1.zip
|
zipfile=$1.zip
|
||||||
listfile=$1.lst
|
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 \
|
test_expect_success \
|
||||||
'git archive --format=zip' \
|
'git archive --format=zip' \
|
||||||
'git archive --format=zip HEAD >d.zip'
|
'git archive --format=zip HEAD >d.zip'
|
||||||
|
|
Loading…
Reference in a new issue