@matheusbsbs / matheus-bagliano / commits / 4114156ae9
Fork 0

Tests on Windows: $(pwd) must return Windows-style paths

Many tests pass $(pwd) in some form to git and later test that the output of git contains the correct value of $(pwd). For example, the test of 'git remote show' sets up a remote that contains $(pwd) and then the expected result must contain $(pwd). Again, MSYS-bash's path mangling kicks in: Plain $(pwd) uses the MSYS style absolute path /c/path/to/git. The test case would write this name into the 'expect' file. But when git is invoked, MSYS-bash converts this name to the Windows style path c:/path/to/git, and git would produce this form in the result; the test would fail. We fix this by passing -W to bash's pwd that produces the Windows-style path. There are a two cases that need an accompanying change: - In t1504 the value of $(pwd) becomes part of a path list. In this case, the lone 'c' in something like /foo:c:/path/to/git:/bar inhibits MSYS-bashes path mangling; IOW in this case we want the /c/path/to/git form to allow path mangling. We use $PWD instead of $(pwd), which always has the latter form. - In t6200, $(pwd) - the Windows style path - must be used to construct the expected result because that is the path form that git sees. (The change in the test itself is just for consistency: 'git fetch' always sees the Windows-style path, with or without the change.) Signed-off-by: Johannes Sixt <j6t@kdbg.org>

Johannes Sixt committed Mar 13, 2009 at 23:35 UTC 4114156ae959a8ecfea62213df35fd8f778d9c4e
3 files changed +7 -3
t/t1504-ceiling-dirs.sh
+1 -1
@@ -13,7 +13,7 @@ test_fail() {
13 "git rev-parse --show-prefix"
14 }
15
16 -TRASH_ROOT="$(pwd)"
16 +TRASH_ROOT="$PWD"
17 ROOT_PARENT=$(dirname "$TRASH_ROOT")
18
19
t/t6200-fmt-merge-msg.sh
+2 -2
@@ -83,13 +83,13 @@ test_expect_success 'merge-msg test #1' '
83 '
84
85 cat >expected <<EOF
86 -Merge branch 'left' of $TEST_DIRECTORY/$test
86 +Merge branch 'left' of $(pwd)
87 EOF
88
89 test_expect_success 'merge-msg test #2' '
90
91 git checkout master &&
92 - git fetch "$TEST_DIRECTORY/$test" left &&
92 + git fetch "$(pwd)" left &&
93
94 git fmt-merge-msg <.git/FETCH_HEAD >actual &&
95 test_cmp expected actual
t/test-lib.sh
+4
@@ -649,5 +649,9 @@ case $(uname -s) in
649 sum () {
650 md5sum "$@"
651 }
652 + # git sees Windows-style pwd
653 + pwd () {
654 + builtin pwd -W
655 + }
656 ;;
657 esac