Skip to content

Commit 8257d3b

Browse files
dschogitster
authored andcommitted
mingw: skip some tests in t9115 due to file name issues
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 <[email protected]> Signed-off-by: Torsten Bögershausen <[email protected]> Reviewed-by: Jonathan Nieder <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 45bf329 commit 8257d3b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t9115-git-svn-dcommit-funky-renames.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
9393
# > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
9494
# > "Private use area") when creating or accessing files.
9595
prepare_a_utf8_locale
96-
test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
96+
test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 new file on dcommit' '
9797
LC_ALL=$a_utf8_locale &&
9898
export LC_ALL &&
9999
neq=$(printf "\201\202") &&
@@ -105,7 +105,7 @@ test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
105105
'
106106

107107
# See the comment on the above test for setting of LC_ALL.
108-
test_expect_success 'svn.pathnameencoding=cp932 rename on dcommit' '
108+
test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 rename on dcommit' '
109109
LC_ALL=$a_utf8_locale &&
110110
export LC_ALL &&
111111
inf=$(printf "\201\207") &&

0 commit comments

Comments
 (0)