diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:53:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:53:54 -0700 |
| commit | 50b335b783680d402974b096e216cd3e823cf6b5 (patch) | |
| tree | 0a3976f895d60ffa3e5a4b87ccfa15b78e3cb3b7 /t/test-lib.sh | |
| parent | 85f083786fe37f280ca30fc0b74498b22b322c6d (diff) | |
| parent | b0562224c93aca5addd994e37cd851b7a5de44b8 (diff) | |
| download | git-50b335b783680d402974b096e216cd3e823cf6b5.tar.gz git-50b335b783680d402974b096e216cd3e823cf6b5.tar.xz | |
Merge branch 'jc/not-mingw-cygwin'
We have been using NOT_{MINGW,CYGWIN} test prerequisites long
before Peff invented support for negated prerequisites e.g. !MINGW
and we still add more uses of the former. Convert them to the
latter to avoid confusion.
* jc/not-mingw-cygwin:
test prerequisites: enumerate with commas
test prerequisites: eradicate NOT_FOO
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index b1bc65bfb..2b525a8e1 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -870,7 +870,6 @@ case $(uname -s) in # backslashes in pathspec are converted to '/' # exec does not inherit the PID test_set_prereq MINGW - test_set_prereq NOT_CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR GIT_TEST_CMP=mingw_test_cmp @@ -878,7 +877,6 @@ case $(uname -s) in *CYGWIN*) test_set_prereq POSIXPERM test_set_prereq EXECKEEPSPID - test_set_prereq NOT_MINGW test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR @@ -887,8 +885,6 @@ case $(uname -s) in test_set_prereq POSIXPERM test_set_prereq BSLASHPSPEC test_set_prereq EXECKEEPSPID - test_set_prereq NOT_MINGW - test_set_prereq NOT_CYGWIN ;; esac |