about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLukas Fleischer2013-04-09 20:02:33 +0200
committerJason A. Donenfeld2013-04-10 14:49:31 +0200
commit81bf4d32b377d3f2fdd7ab3ca651be99408f5c32 (patch)
treea78805b55f6acb128b59eead50025a646aa8650d
parenttests/: Do not use `sed -i` (diff)
downloadcgit-81bf4d32b377d3f2fdd7ab3ca651be99408f5c32.tar.gz
cgit-81bf4d32b377d3f2fdd7ab3ca651be99408f5c32.zip
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>
-rwxr-xr-xtests/t0107-snapshot.sh14
1 files changed, 10 insertions, 4 deletions
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index 7e6f5bf..053062c 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh
@@ -54,21 +54,27 @@ test_expect_success 'strip off the header lines (zip)' '
54 tail -n +6 tmp >master.zip 54 tail -n +6 tmp >master.zip
55' 55'
56 56
57test_expect_success 'verify zip format' ' 57if test -n "$(which unzip 2>/dev/null)"; then
58 test_set_prereq UNZIP
59else
60 say 'Skipping ZIP validation tests: unzip not found'
61fi
62
63test_expect_success UNZIP 'verify zip format' '
58 unzip -t master.zip 64 unzip -t master.zip
59' 65'
60 66
61test_expect_success 'unzip' ' 67test_expect_success UNZIP 'unzip' '
62 rm -rf master && 68 rm -rf master &&
63 unzip master.zip 69 unzip master.zip
64' 70'
65 71
66test_expect_success 'count files (zip)' ' 72test_expect_success UNZIP 'count files (zip)' '
67 ls master/ >output && 73 ls master/ >output &&
68 test_line_count = 5 output 74 test_line_count = 5 output
69' 75'
70 76
71test_expect_success 'verify unzipped file-5' ' 77test_expect_success UNZIP 'verify unzipped file-5' '
72 grep "^5$" master/file-5 && 78 grep "^5$" master/file-5 &&
73 test_line_count = 1 master/file-5 79 test_line_count = 1 master/file-5
74' 80'