undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t5000: factor out check_tar

Browse Source 
Create a helper function that extracts a tar archive and checks its
contents, modelled after check_zip in t5003.

Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2013-05-20 11:58:26 +02:00 committed by Junio C Hamano
parent 1355241bf5
commit deb9c8ed85
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
t/t5000-tar-tree.sh
View File

@ -30,6 +30,26 @@ GUNZIP=${GUNZIP:-gzip -d}
SUBSTFORMAT=%H%n SUBSTFORMAT=%H%n
check_tar() {
tarfile=$1.tar
listfile=$1.lst
dir=$1
dir_with_prefix=$dir/$2
test_expect_success ' extract tar archive' '
(mkdir $dir && cd $dir && "$TAR" xf -) <$tarfile
'
test_expect_success ' validate filenames' '
(cd ${dir_with_prefix}a && find .) | sort >$listfile &&
test_cmp a.lst $listfile
'
test_expect_success ' validate file contents' '
diff -r a ${dir_with_prefix}a
'
}
test_expect_success \ test_expect_success \
'populate workdir' \ 'populate workdir' \
'mkdir a && 'mkdir a &&
@ -81,6 +101,8 @@ test_expect_success \
'git archive' \ 'git archive' \
'git archive HEAD >b.tar' 'git archive HEAD >b.tar'
check_tar b
test_expect_success \ test_expect_success \
'git tar-tree' \ 'git tar-tree' \
'git tar-tree HEAD >b2.tar' 'git tar-tree HEAD >b2.tar'
@ -124,19 +146,6 @@ test_expect_success \
'git get-tar-commit-id <b.tar >b.commitid && 'git get-tar-commit-id <b.tar >b.commitid &&
test_cmp .git/$(git symbolic-ref HEAD) b.commitid' test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
test_expect_success \
'extract tar archive' \
'(mkdir b && cd b && "$TAR" xf -) <b.tar'
test_expect_success \
'validate filenames' \
'(cd b/a && find .) | sort >b.lst &&
test_cmp a.lst b.lst'
test_expect_success \
'validate file contents' \
'diff -r a b/a'
test_expect_success \ test_expect_success \
'git tar-tree with prefix' \ 'git tar-tree with prefix' \
'git tar-tree HEAD prefix >c.tar' 'git tar-tree HEAD prefix >c.tar'