Re: [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows
From: Lars Schneider <hidden>
Date: 2016-06-15 23:08:54
On 23 Mar 2016, at 11:55, Johannes Schindelin [off-list ref] wrote:
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).Thanks for these Windows fixes! After the 2.8 release I will try to post a patch that uses a different filename where possible. Cheers, Lars
quoted hunk ↗ jump to hunk
Signed-off-by: Johannes Schindelin <redacted> --- t/t1300-repo-config.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh index dca27a3..a37ebb2 100755 --- a/t/t1300-repo-config.sh +++ b/t/t1300-repo-config.sh@@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '"die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600" ' +! test_have_prereq MINGW || +HOME="$(pwd)" # convert to Windows path + test_expect_success 'set up --show-origin tests' ' INCLUDE_DIR="$HOME/include" && mkdir -p "$INCLUDE_DIR" &&@@ -1232,6 +1235,7 @@ test_expect_success 'set up --show-origin tests' 'EOF ' + test_expect_success '--show-origin with --list' ' cat >expect <<-EOF && file:$HOME/.gitconfig user.global=true@@ -1304,7 +1308,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 +1337,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 +1346,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