summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2012-09-09 15:42:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-10 16:31:44 (GMT)
commitbacca7852f2f304ebe3f579de1a6cf0152af3df1 (patch)
tree4d139f96cd833c362cdc5bc3d292baf003bb3167
parent379a03ad8194192ab7b2910ec3326a981971fda1 (diff)
downloadgit-bacca7852f2f304ebe3f579de1a6cf0152af3df1.zip
git-bacca7852f2f304ebe3f579de1a6cf0152af3df1.tar.gz
git-bacca7852f2f304ebe3f579de1a6cf0152af3df1.tar.bz2
t0060: split absolute path test in two to exercise some of it on Windows
Only the first half of the test works only on POSIX, the second half passes on Windows as well. A later test "real path removes other extra slashes" looks very similar, but it does not make sense to split it in the same way: When two slashes are prepended in front of an absolute DOS-style path on Windows, the meaning of the path is changed (//server/share style), so that the test cannot pass on Windows. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t0060-path-utils.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index e40f764..4ef2345 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -148,10 +148,14 @@ test_expect_success 'real path rejects the empty string' '
test_must_fail test-path-utils real_path ""
'
-test_expect_success POSIX 'real path works on absolute paths' '
+test_expect_success POSIX 'real path works on absolute paths 1' '
nopath="hopefully-absent-path" &&
test "/" = "$(test-path-utils real_path "/")" &&
- test "/$nopath" = "$(test-path-utils real_path "/$nopath")" &&
+ test "/$nopath" = "$(test-path-utils real_path "/$nopath")"
+'
+
+test_expect_success 'real path works on absolute paths 2' '
+ nopath="hopefully-absent-path" &&
# Find an existing top-level directory for the remaining tests:
d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") &&
test "$d" = "$(test-path-utils real_path "$d")" &&