summaryrefslogtreecommitdiffstats
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-02 08:45:37 +0200
committerJunio C Hamano <gitster@pobox.com>2008-06-02 08:45:37 +0200
commitf0d2a057c1f8c1f425a81888bc9fd3fbca29bf99 (patch)
treeda09c8a506cf0742467b71d792abe5b961505df4 /t
parentMerge branch 'sp/remote' (diff)
parentt/test-lib.sh: resolve symlinks in working directory, for pathname comparisons (diff)
downloadgit-f0d2a057c1f8c1f425a81888bc9fd3fbca29bf99.tar.xz
git-f0d2a057c1f8c1f425a81888bc9fd3fbca29bf99.zip
Merge branch 'lw/test-fix'
* lw/test-fix: t/test-lib.sh: resolve symlinks in working directory, for pathname comparisons
Diffstat (limited to 't')
-rw-r--r--t/test-lib.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 3bf570b068..7a8bd27abc 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -419,7 +419,9 @@ rm -fr "$test" || {
}
test_create_repo "$test"
-cd "$test" || exit 1
+# Use -P to resolve symlinks in our working directory so that the cwd
+# in subprocesses like git equals our $PWD (for pathname comparisons).
+cd -P "$test" || exit 1
this_test=$(expr "./$0" : '.*/\(t[0-9]*\)-[^/]*$')
for skp in $GIT_SKIP_TESTS