mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
test-lib.sh - define and use GREP_STRIPS_CR
Define a common macro for grep needing -U to allow tests to not need to inquire of specific platforms needing this option. Change t3032 and t5560 to use this rather than testing explicitly for mingw. This fixes these two tests on Cygwin. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
f59bebb78e
commit
97669eed10
|
@ -14,7 +14,7 @@ test_description='merge-recursive options
|
|||
. ./test-lib.sh
|
||||
|
||||
test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
|
||||
test_have_prereq MINGW && export GREP_OPTIONS=-U
|
||||
test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
|
||||
|
||||
test_expect_success 'setup' '
|
||||
conflict_hunks () {
|
||||
|
|
|
@ -5,7 +5,7 @@ test_description='test git-http-backend-noserver'
|
|||
|
||||
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
|
||||
|
||||
test_have_prereq MINGW && export GREP_OPTIONS=-U
|
||||
test_have_prereq GREP_STRIPS_CR && export GREP_OPTIONS=-U
|
||||
|
||||
run_backend() {
|
||||
echo "$2" |
|
||||
|
|
|
@ -668,6 +668,7 @@ case $(uname -s) in
|
|||
test_set_prereq MINGW
|
||||
test_set_prereq NOT_CYGWIN
|
||||
test_set_prereq SED_STRIPS_CR
|
||||
test_set_prereq GREP_STRIPS_CR
|
||||
;;
|
||||
*CYGWIN*)
|
||||
test_set_prereq POSIXPERM
|
||||
|
@ -675,6 +676,7 @@ case $(uname -s) in
|
|||
test_set_prereq NOT_MINGW
|
||||
test_set_prereq CYGWIN
|
||||
test_set_prereq SED_STRIPS_CR
|
||||
test_set_prereq GREP_STRIPS_CR
|
||||
;;
|
||||
*)
|
||||
test_set_prereq POSIXPERM
|
||||
|
|
Loading…
Reference in a new issue