Browse Source

mingw: do not bother to test funny file names

MSYS2 actually allows to create files or directories whose names contain
tabs, newlines or colors, even if plain Win32 API cannot access them.
As we are using an MSYS2 bash to run the tests, such files or
directories are created successfully, but Git itself has no chance to
work with them because it is a regular Windows program, hence limited by
the Win32 API.

With this change, on Windows otherwise failing tests in
t3300-funny-names.sh, t3600-rm.sh, t3703-add-magic-pathspec.sh,
t3902-quoted.sh, t4016-diff-quote.sh, t4135-apply-weird-filenames.sh,
t9200-git-cvsexportcommit.sh, and t9903-bash-prompt.sh are skipped.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 9 years ago committed by Junio C Hamano
parent
commit
4539a8982c
  1. 1
      t/t3300-funny-names.sh
  2. 2
      t/t3600-rm.sh
  3. 2
      t/t3703-add-magic-pathspec.sh
  4. 1
      t/t3902-quoted.sh
  5. 1
      t/t4016-diff-quote.sh
  6. 3
      t/t4135-apply-weird-filenames.sh
  7. 2
      t/t9200-git-cvsexportcommit.sh
  8. 2
      t/t9903-bash-prompt.sh

1
t/t3300-funny-names.sh

@ -13,6 +13,7 @@ tree, index, and tree objects. @@ -13,6 +13,7 @@ tree, index, and tree objects.

HT=' '

test_have_prereq MINGW ||
echo 2>/dev/null > "Name with an${HT}HT"
if ! test -f "Name with an${HT}HT"
then

2
t/t3600-rm.sh

@ -14,7 +14,7 @@ test_expect_success \ @@ -14,7 +14,7 @@ test_expect_success \
git add -- foo bar baz 'space embedded' -q &&
git commit -m 'add normal files'"

if touch -- 'tab embedded' 'newline
if test_have_prereq !MINGW && touch -- 'tab embedded' 'newline
embedded' 2>/dev/null
then
test_set_prereq FUNNYNAMES

2
t/t3703-add-magic-pathspec.sh

@ -38,7 +38,7 @@ cat >expected <<EOF @@ -38,7 +38,7 @@ cat >expected <<EOF
add 'sub/foo'
EOF

if mkdir ":" 2>/dev/null
if test_have_prereq !MINGW && mkdir ":" 2>/dev/null
then
test_set_prereq COLON_DIR
fi

1
t/t3902-quoted.sh

@ -12,6 +12,7 @@ GN='純' @@ -12,6 +12,7 @@ GN='純'
HT=' '
DQ='"'

test_have_prereq MINGW ||
echo foo 2>/dev/null > "Name and an${HT}HT"
if ! test -f "Name and an${HT}HT"
then

1
t/t4016-diff-quote.sh

@ -13,6 +13,7 @@ P1='pathname with HT' @@ -13,6 +13,7 @@ P1='pathname with HT'
P2='pathname with SP'
P3='pathname
with LF'
test_have_prereq !MINGW &&
echo 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" || {
skip_all='Your filesystem does not allow tabs in filenames'
test_done

3
t/t4135-apply-weird-filenames.sh

@ -19,7 +19,8 @@ test_expect_success 'setup' ' @@ -19,7 +19,8 @@ test_expect_success 'setup' '

test_when_finished "rm -f \"tab embedded.txt\"" &&
test_when_finished "rm -f '\''\"quoteembedded\".txt'\''" &&
if touch -- "tab embedded.txt" '\''"quoteembedded".txt'\''
if test_have_prereq !MINGW &&
touch -- "tab embedded.txt" '\''"quoteembedded".txt'\''
then
test_set_prereq FUNNYNAMES
fi

2
t/t9200-git-cvsexportcommit.sh

@ -197,7 +197,7 @@ if p="Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" && @@ -197,7 +197,7 @@ if p="Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" &&
then

# This test contains UTF-8 characters
test_expect_success \
test_expect_success !MINGW \
'File with non-ascii file name' \
'mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö &&
echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt &&

2
t/t9903-bash-prompt.sh

@ -67,7 +67,7 @@ repo_with_newline='repo @@ -67,7 +67,7 @@ repo_with_newline='repo
with
newline'

if mkdir "$repo_with_newline" 2>/dev/null
if test_have_prereq !MINGW && mkdir "$repo_with_newline" 2>/dev/null
then
test_set_prereq FUNNYNAMES
else

Loading…
Cancel
Save