Commit 552a26c8 authored by Johannes Sixt's avatar Johannes Sixt

Use prerequisites to skip tests that need unzip

Signed-off-by: default avatarJohannes Sixt <[email protected]>
parent 6fd1106a
......@@ -29,11 +29,11 @@ test_expect_success 'tar archive' '
"$UNZIP" -v >/dev/null 2>&1
if [ $? -eq 127 ]; then
say "Skipping ZIP test, because unzip was not found"
test_done
exit
else
test_set_prereq UNZIP
fi
test_expect_success 'zip archive' '
test_expect_success UNZIP 'zip archive' '
git archive --format=zip HEAD >test.zip &&
......
......@@ -187,20 +187,20 @@ test_expect_success 'git archive --format=zip with --output' \
$UNZIP -v >/dev/null 2>&1
if [ $? -eq 127 ]; then
say "Skipping ZIP tests, because unzip was not found"
test_done
exit
else
test_set_prereq UNZIP
fi
test_expect_success \
test_expect_success UNZIP \
'extract ZIP archive' \
'(mkdir d && cd d && $UNZIP ../d.zip)'
test_expect_success \
test_expect_success UNZIP \
'validate filenames' \
'(cd d/a && find .) | sort >d.lst &&
test_cmp a.lst d.lst'
test_expect_success \
test_expect_success UNZIP \
'validate file contents' \
'diff -r a d/a'
......@@ -208,16 +208,16 @@ test_expect_success \
'git archive --format=zip with prefix' \
'git archive --format=zip --prefix=prefix/ HEAD >e.zip'
test_expect_success \
test_expect_success UNZIP \
'extract ZIP archive with prefix' \
'(mkdir e && cd e && $UNZIP ../e.zip)'
test_expect_success \
test_expect_success UNZIP \
'validate filenames with prefix' \
'(cd e/prefix/a && find .) | sort >e.lst &&
test_cmp a.lst e.lst'
test_expect_success \
test_expect_success UNZIP \
'validate file contents with prefix' \
'diff -r a e/prefix/a'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment