diff options
author | Lukas Fleischer | 2013-04-09 20:02:33 +0200 |
---|---|---|
committer | Jason A. Donenfeld | 2013-04-10 14:49:31 +0200 |
commit | 81bf4d32b377d3f2fdd7ab3ca651be99408f5c32 (patch) | |
tree | a78805b55f6acb128b59eead50025a646aa8650d | |
parent | tests/: Do not use `sed -i` (diff) | |
download | cgit-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-x | tests/t0107-snapshot.sh | 14 |
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 | ||
57 | test_expect_success 'verify zip format' ' | 57 | if test -n "$(which unzip 2>/dev/null)"; then |
58 | test_set_prereq UNZIP | ||
59 | else | ||
60 | say 'Skipping ZIP validation tests: unzip not found' | ||
61 | fi | ||
62 | |||
63 | test_expect_success UNZIP 'verify zip format' ' | ||
58 | unzip -t master.zip | 64 | unzip -t master.zip |
59 | ' | 65 | ' |
60 | 66 | ||
61 | test_expect_success 'unzip' ' | 67 | test_expect_success UNZIP 'unzip' ' |
62 | rm -rf master && | 68 | rm -rf master && |
63 | unzip master.zip | 69 | unzip master.zip |
64 | ' | 70 | ' |
65 | 71 | ||
66 | test_expect_success 'count files (zip)' ' | 72 | test_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 | ||
71 | test_expect_success 'verify unzipped file-5' ' | 77 | test_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 | ' |