From 25d3d323633dbf3b8e8fbe209c9054196a202cf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 6 Jan 2013 18:49:00 +0100 Subject: 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 Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t5000-tar-tree.sh | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 't/t5000-tar-tree.sh') 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' -- cgit v1.2.1