[PATCH 3/4] t1300: fix the new --show-origin tests on Windows
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 22, 2016, 17:42 UTC
- Message-ID
- <a43d6d1f46a90eea9083f329ad0dfb17915c38a1.1458668543.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1458668543.git.johannes.schindelin@gmx.de>
On Windows, we have that funny situation where the test script can refer to POSIX paths because it runs in a shell that uses a POSIX emulation layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths at all but only pure Windows paths.
So let's just convert the POSIX paths to Windows paths before passing them on to Git, using `pwd` (which is already modified on Windows to output Windows paths).
While fixing the new tests on Windows, we also have to exclude the tests that want to write a file with a name that is illegal on Windows (unfortunately, there is more than one test trying to make use of that file).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t1300-repo-config.sh | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index 0236fe2..18eb769 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh @@ -1232,6 +1232,15 @@ test_expect_success 'set up --show-origin tests' ' EOF ' +if test_have_prereq MINGW +then + # convert to Windows paths + HOME="$(pwd)" + INCLUDE_DIR="$HOME/include" + export HOME INCLUDE_DIR + git config -f .gitconfig include.path "$INCLUDE_DIR/absolute.include" +fi + test_expect_success '--show-origin with --list' ' cat >expect <<-EOF && file:$HOME/.gitconfig user.global=true @@ -1304,7 +1313,7 @@ test_expect_success 'set up custom config file' ' EOF ' -test_expect_success '--show-origin escape special file name characters' ' +test_expect_success !MINGW '--show-origin escape special file name characters' ' cat >expect <<-\EOF && file:"file\" (dq) and spaces.conf" user.custom=true EOF @@ -1333,7 +1342,7 @@ test_expect_success '--show-origin stdin with file include' ' test_cmp expect output ' -test_expect_success '--show-origin blob' ' +test_expect_success !MINGW '--show-origin blob' ' cat >expect <<-\EOF && blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08 user.custom=true EOF @@ -1342,7 +1351,7 @@ test_expect_success '--show-origin blob' ' test_cmp expect output ' -test_expect_success '--show-origin blob ref' ' +test_expect_success !MINGW '--show-origin blob ref' ' cat >expect <<-\EOF && blob:"master:file\" (dq) and spaces.conf" user.custom=true EOF
-- 2.7.4.windows.1