diff options
| author |  Alex Riesen <raa.lkml@gmail.com> | 2006-01-05 12:55:58 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-01-05 17:23:46 -0800 |
| commit | b484ef28fbdc3e2ac242c37507eee5ace90f3915 (patch) | |
| tree | 4ccd037f90cbdbf5dcece46f4ce85fe1a76cecab | |
| parent | trivial: use git-repo-config to detect if the test can be run on the repository (diff) | |
| download | tgif-b484ef28fbdc3e2ac242c37507eee5ace90f3915.tar.xz | |
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>
| -rwxr-xr-x | t/t4006-diff-mode.sh | 20 | ||||
| -rwxr-xr-x | t/t4102-apply-rename.sh | 9 |
2 files changed, 22 insertions, 7 deletions
diff --git a/t/t4006-diff-mode.sh b/t/t4006-diff-mode.sh index e2a67e9633..8ad69d1115 100755 --- a/t/t4006-diff-mode.sh +++ b/t/t4006-diff-mode.sh @@ -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" diff --git a/t/t4102-apply-rename.sh b/t/t4102-apply-rename.sh index 0401d7bbc6..fbb508d389 100755 --- a/t/t4102-apply-rename.sh +++ b/t/t4102-apply-rename.sh @@ -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 |