t0107: Skip ZIP tests if unzip(1) isn't available

Note that we cannot use skip_all here since some tests have already been
executed when ZIP tests are reached. Use test prerequisites to skip
everything using unzip(1) if the binary is not available instead.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>

diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 7e6f5bf2085e549ea49ecb23c017a6c942d42299..053062c27504cada28d72e5d4ee517357c0f6e0a 100755 (executable)
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -54,21 +54,27 @@ test_expect_success 'strip off the header lines (zip)' '
        tail -n +6 tmp >master.zip
 '
 
        tail -n +6 tmp >master.zip
 '
 

-test_expect_success 'verify zip format' '
+if test -n "$(which unzip 2>/dev/null)"; then
+       test_set_prereq UNZIP
+else
+       say 'Skipping ZIP validation tests: unzip not found'
+fi
+
+test_expect_success UNZIP 'verify zip format' '

        unzip -t master.zip
 '
 
        unzip -t master.zip
 '
 

-test_expect_success 'unzip' '
+test_expect_success UNZIP 'unzip' '

        rm -rf master &&
        unzip master.zip
 '
 
        rm -rf master &&
        unzip master.zip
 '
 

-test_expect_success 'count files (zip)' '
+test_expect_success UNZIP 'count files (zip)' '

        ls master/ >output &&
        test_line_count = 5 output
 '
 
        ls master/ >output &&
        test_line_count = 5 output
 '
 

-test_expect_success 'verify unzipped file-5' '
+test_expect_success UNZIP 'verify unzipped file-5' '

        grep "^5$" master/file-5 &&
        test_line_count = 1 master/file-5
 '
        grep "^5$" master/file-5 &&
        test_line_count = 1 master/file-5
 '