freshlybakedca.ke / git
Git fork
fork atom

t6137-*.sh: fix test failure on cygwin

Commit 6fd1106aa4 ("t3700: Skip a test with backslashes in pathspec",
2009-03-13) introduced the BSLASHPSPEC prerequisite. This prerequisite
allows tests to check for systems that can use backslashes in pathspecs
(e.g. to escape glob special characters). On windows (and cygwin), this
does not work because backslashes are used as directory separators, and
git eagerly converts them to forward slashes.

This test file uses the FUNNYNAMES prerequisite to skip this test file
on windows, despite not really being appropriate for this test, which
does not hold on cygwin. The FUNNYNAMES prerequisite is set when the
system can create files with embedded quotes ("), tabs or newlines in
the name. Since cygwin can satisfy FUNNYNAMES, but not BSLASHPSPEC, this
leads to test failures on cygwin.

In order to skip these tests on cygwin, replace the FUNNYNAMES prerequisite
with BSLASHPSPEC, so that this test file is skipped on both windows and
cygwin. While here, fix a few test titles as well.

Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

authored by

Ramsay Jones and committed by
Junio C Hamano cf7efa4f 16bd9f20

+6 -6
unified split
+6 -6
t/t6137-pathspec-wildcards-literal.sh
··· 3 4 . ./test-lib.sh 5 6 - test_have_prereq FUNNYNAMES || { 7 - skip_all='skipping: needs FUNNYNAMES (non-Windows only)' 8 test_done 9 } 10 ··· 184 ) 185 ' 186 187 - test_expect_success 'add literal \? literal' ' 188 git init test-q-lit && 189 ( 190 cd test-q-lit && ··· 241 ) 242 ' 243 244 - test_expect_success 'add literal [abc]' ' 245 git init test-brackets-lit && 246 ( 247 cd test-brackets-lit && ··· 280 ) 281 ' 282 283 - test_expect_success 'commit: literal *' ' 284 git init test-c-asterisk-lit && 285 ( 286 cd test-c-asterisk-lit && ··· 328 ) 329 ' 330 331 - test_expect_success 'commit: wildcard pathspec limits commit' ' 332 git init test-c-pathlimit && 333 ( 334 cd test-c-pathlimit &&
··· 3 4 . ./test-lib.sh 5 6 + test_have_prereq BSLASHPSPEC || { 7 + skip_all='skipping: needs BSLASHPSPEC (backslashes in pathspecs)' 8 test_done 9 } 10 ··· 184 ) 185 ' 186 187 + test_expect_success 'add literal \?' ' 188 git init test-q-lit && 189 ( 190 cd test-q-lit && ··· 241 ) 242 ' 243 244 + test_expect_success 'add literal \[abc\]' ' 245 git init test-brackets-lit && 246 ( 247 cd test-brackets-lit && ··· 280 ) 281 ' 282 283 + test_expect_success 'commit: literal \*' ' 284 git init test-c-asterisk-lit && 285 ( 286 cd test-c-asterisk-lit && ··· 328 ) 329 ' 330 331 + test_expect_success 'commit: wildcard f**' ' 332 git init test-c-pathlimit && 333 ( 334 cd test-c-pathlimit &&