diff options
| author | Lukas Fleischer <cgit@cryptocrack.de> | 2013-04-09 20:02:33 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2013-04-10 14:49:31 +0200 |
| commit | 81bf4d32b377d3f2fdd7ab3ca651be99408f5c32 (patch) | |
| tree | a78805b55f6acb128b59eead50025a646aa8650d | |
| parent | 016364d4edef261fb55257e36d8a47828d398f96 (diff) | |
| download | cgit-81bf4d32b377d3f2fdd7ab3ca651be99408f5c32.tar.gz cgit-81bf4d32b377d3f2fdd7ab3ca651be99408f5c32.tar.bz2 | |
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)' ' 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 ' -test_expect_success 'unzip' ' +test_expect_success UNZIP 'unzip' ' 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 ' -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 ' |