development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use prerequisites to skip tests that need unzip

Browse source 
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
This commit is contained in:
Johannes Sixt 2009-03-16 14:44:56 +01:00
parent 6fd1106aa4
commit 552a26c8c0
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
t/t0024-crlf-archive.sh
View file

@ -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 &&

16
t/t5000-tar-tree.sh
View file

@ -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'