Skip to content

Commit

Permalink
t5003: check if unzip supports symlinks
Browse files Browse the repository at this point in the history
Only add a symlink to the repository if both the filesystem and
unzip support symlinks.  To check the latter, add a ZIP file
containing a symlink, created like this with InfoZIP zip 3.0:

	$ echo sample text >textfile
	$ ln -s textfile symlink
	$ zip -y infozip-symlinks.zip textfile symlink

If we can extract it successfully, we add a symlink to the test
repository for git archive --format=zip, or otherwise skip that
step.  Users can see the skipped test and perhaps run it again
with a different unzip version.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
René Scharfe authored and gitster committed Jan 7, 2013
1 parent e9882c8 commit 55292ea
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
26 changes: 19 additions & 7 deletions t/t5003-archive-zip.sh
Expand Up @@ -12,6 +12,15 @@ test_lazy_prereq UNZIP '
test $? -ne 127
'

test_lazy_prereq UNZIP_SYMLINKS '
(
mkdir unzip-symlinks &&
cd unzip-symlinks &&
"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
test -h symlink
)
'

check_zip() {
zipfile=$1.zip
listfile=$1.lst
Expand Down Expand Up @@ -40,15 +49,18 @@ test_expect_success \
cp /bin/sh a/bin &&
printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
printf "A not substituted O" >a/substfile2 &&
if test_have_prereq SYMLINKS; then
ln -s a a/l1
else
printf %s a > a/l1
fi &&
(p=long_path_to_a_file && cd a &&
for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
echo text >file_with_long_path) &&
(cd a && find .) | sort >a.lst'
echo text >file_with_long_path)
'

test_expect_success SYMLINKS,UNZIP_SYMLINKS 'add symlink' '
ln -s a a/symlink_to_a
'

test_expect_success 'prepare file list' '
(cd a && find .) | sort >a.lst
'

test_expect_success \
'add ignored file' \
Expand Down
Binary file added t/t5003/infozip-symlinks.zip
Binary file not shown.

0 comments on commit 55292ea

Please sign in to comment.