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

[PATCH v2 4/4] mingw: skip some tests in t9115 due to file name issues

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Mar 23, 2016, 10:55 UTC
Message-ID
<93fc4beb28097a021b2549ab2c156869c178597d.1458730457.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1458730457.git.johannes.schindelin@gmx.de>

These two tests wanted to write file names which are incompatible with Windows' file naming rules (even if they pass using Cygwin due to Cygwin's magic path mangling).

While at it, skip the same tests also on MacOSX/HFS, as pointed out by Torsten Bögershausen.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Torsten Bögershausen <tboegi@web.de>
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 t/t9115-git-svn-dcommit-funky-renames.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 0990f8d..a87d3d3 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -93,7 +93,7 @@ test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
 # > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
 # > "Private use area") when creating or accessing files.
 prepare_a_utf8_locale
-test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
+test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 new file on dcommit' '
 	LC_ALL=$a_utf8_locale &&
 	export LC_ALL &&
 	neq=$(printf "\201\202") &&
@@ -105,7 +105,7 @@ test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
 '
 
 # See the comment on the above test for setting of LC_ALL.
-test_expect_success 'svn.pathnameencoding=cp932 rename on dcommit' '
+test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 rename on dcommit' '
 	LC_ALL=$a_utf8_locale &&
 	export LC_ALL &&
 	inf=$(printf "\201\207") &&
-- 
2.7.4.windows.1
Previous: Lars Schneider
Message 42 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.