diff options
author | William Chargin <wchargin@gmail.com> | 2018-08-06 20:35:08 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-06 22:35:15 +0200 |
commit | 6ec633059ad0b17850ad18c7325678d6c845b74c (patch) | |
tree | 64f5d0afb47d1427a3b3aac6474f5bfbb34f5337 /t/t3600-rm.sh | |
parent | Git 2.18 (diff) | |
download | git-6ec633059ad0b17850ad18c7325678d6c845b74c.tar.xz git-6ec633059ad0b17850ad18c7325678d6c845b74c.zip |
t: factor out FUNNYNAMES as shared lazy prereq
A fair number of tests need to check that the filesystem supports file
names including "funny" characters, like newline, tab, and double-quote.
Jonathan Nieder suggested that this be extracted into a lazy prereq in
the top-level `test-lib.sh`. This patch effects that change.
The FUNNYNAMES prereq now uniformly requires support for newlines, tabs,
and double-quotes in filenames. This very slightly decreases the power
of some tests, which might have run previously on a system that supports
(e.g.) newlines and tabs but not double-quotes, but now will not. This
seems to me like an acceptable tradeoff for consistency.
One test (`t/t9902-completion.sh`) defined FUNNYNAMES to further require
the separators \034 through \037, the test for which was implemented
using the Bash-specific $'\034' syntax. I've elected to leave this one
as is, renaming it to FUNNIERNAMES.
After this patch, `git grep 'test_\(set\|lazy\)_prereq.*FUNNYNAMES'` has
only one result.
Signed-off-by: William Chargin <wchargin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3600-rm.sh')
-rwxr-xr-x | t/t3600-rm.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index b8fbdefcdc..5829dfd12c 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -14,15 +14,13 @@ test_expect_success \ git add -- foo bar baz 'space embedded' -q && git commit -m 'add normal files'" -if test_have_prereq !MINGW && touch -- 'tab embedded' 'newline -embedded' 2>/dev/null -then - test_set_prereq FUNNYNAMES -else +if test_have_prereq !FUNNYNAMES; then say 'Your filesystem does not allow tabs in filenames.' fi test_expect_success FUNNYNAMES 'add files with funny names' " + touch -- 'tab embedded' 'newline +embedded' && git add -- 'tab embedded' 'newline embedded' && git commit -m 'add files with tabs and newlines' |