trivial: use git-repo-config to detect how to run tests in the test repository
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
e58b97af31
commit
b484ef28fb
@ -15,11 +15,21 @@ test_expect_success \
|
||||
tree=`git-write-tree` &&
|
||||
echo $tree'
|
||||
|
||||
test_expect_success \
|
||||
'chmod' \
|
||||
'chmod +x rezrov &&
|
||||
git-update-index rezrov &&
|
||||
git-diff-index $tree >current'
|
||||
if [ "$(git repo-config --get core.filemode)" = false ]
|
||||
then
|
||||
say 'filemode disabled on the filesystem, using update-index --chmod=+x'
|
||||
test_expect_success \
|
||||
'git-update-index --chmod=+x' \
|
||||
'git-update-index rezrov &&
|
||||
git-update-index --chmod=+x rezrov &&
|
||||
git-diff-index $tree >current'
|
||||
else
|
||||
test_expect_success \
|
||||
'chmod' \
|
||||
'chmod +x rezrov &&
|
||||
git-update-index rezrov &&
|
||||
git-diff-index $tree >current'
|
||||
fi
|
||||
|
||||
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
|
||||
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
|
||||
|
@ -31,7 +31,12 @@ test_expect_success setup \
|
||||
test_expect_success apply \
|
||||
'git-apply --index --stat --summary --apply test-patch'
|
||||
|
||||
test_expect_success validate \
|
||||
'test -f bar && ls -l bar | grep "^-..x......"'
|
||||
if [ "$(git repo-config --get core.filemode)" = false ]
|
||||
then
|
||||
say 'filemode disabled on the filesystem'
|
||||
else
|
||||
test_expect_success validate \
|
||||
'test -f bar && ls -l bar | grep "^-..x......"'
|
||||
fi
|
||||
|
||||
test_done
|
||||
|
Loading…
Reference in New Issue
Block a user