git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 3/4] t1300: fix the new --show-origin tests on Windows

From
Lars Schneider <larsxschneider@gmail.com>
Date
Mar 23, 2016, 11:08 UTC
Message-ID
<144C8B10-A98F-4888-ADB8-8C9D67BF52D9@gmail.com>
In-Reply-To
<86f6c23e500867f403c33c2716826dc0c5db0cdb.1458730457.git.johannes.schindelin@gmx.de>
On 23 Mar 2016, at 11:55, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:
Show 13 quoted lines
> 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

Show 59 quoted lines
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> 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
> 
> 
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 41 of 42 in “Git for Windows fixes in preparation for 2.8.0”
  1. 0/4 Git for Windows fixes in preparation for 2.8.0Johannes Schindelin, Mar 22, 2016
  2. 1/4 config --show-origin: report paths with forward slashesJohannes Schindelin, Mar 22, 2016
  3. Junio C HamanoMar 22, 2016
  4. Johannes SchindelinMar 23, 2016
  5. Junio C HamanoMar 23, 2016
  6. Johannes SixtMar 28, 2016
  7. Johannes SchindelinMar 28, 2016
  8. Johannes SixtMar 29, 2016
  9. Junio C HamanoMar 29, 2016
  10. Johannes SixtApr 2, 2016
  11. Junio C HamanoApr 4, 2016
  12. Johannes SchindelinApr 4, 2016
  13. Johannes SixtMar 30, 2016
  14. Johannes SixtApr 2, 2016
  15. 2/4 Make t1300-repo-config resilient to being run via 'sh -x'Johannes Schindelin, Mar 22, 2016
  16. Jonathan NiederMar 22, 2016
  17. Junio C HamanoMar 22, 2016
  18. Jonathan NiederMar 22, 2016
  19. Johannes SchindelinMar 23, 2016
  20. Junio C HamanoMar 22, 2016
  21. Johannes SchindelinMar 23, 2016
  22. 3/4 t1300: fix the new --show-origin tests on WindowsJohannes Schindelin, Mar 22, 2016
  23. Junio C HamanoMar 22, 2016
  24. Johannes SchindelinMar 23, 2016
  25. 4/4 mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin, Mar 22, 2016
  26. Jonathan NiederMar 22, 2016
  27. Torsten BögershausenMar 22, 2016
  28. Junio C HamanoMar 22, 2016
  29. Torsten BögershausenMar 22, 2016
  30. Junio C HamanoMar 22, 2016
  31. Torsten BögershausenMar 23, 2016
  32. Johannes SchindelinMar 23, 2016
  33. Junio C HamanoMar 23, 2016
  34. Torsten BögershausenMar 23, 2016
  35. Torsten BögershausenMar 23, 2016
  36. Junio C HamanoMar 22, 2016
  37. 0/4 Git for Windows fixes in preparation for 2.8.0Johannes Schindelin, Mar 23, 2016
  38. 1/4 config --show-origin: report paths with forward slashesJohannes Schindelin, Mar 23, 2016
  39. 2/4 Make t1300-repo-config resilient to being run via 'sh -x'Johannes Schindelin, Mar 23, 2016
  40. 3/4 t1300: fix the new --show-origin tests on WindowsJohannes Schindelin, Mar 23, 2016
  41. Lars SchneiderMar 23, 2016
  42. 4/4 mingw: skip some tests in t9115 due to file name issuesJohannes Schindelin, Mar 23, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.