Skip to content

Commit

Permalink
trivial: use git-repo-config to detect how to run tests in the test r…
Browse files Browse the repository at this point in the history
…epository

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Alex Riesen authored and Junio C Hamano committed Jan 6, 2006
1 parent e58b97a commit b484ef2
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
20 changes: 15 additions & 5 deletions t/t4006-diff-mode.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 7 additions & 2 deletions t/t4102-apply-rename.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit b484ef2

Please sign in to comment.