diff options
| author | Mark Levedahl <mlevedahl@gmail.com> | 2013-07-18 17:44:57 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-18 16:44:40 -0700 |
| commit | 97669eed109f5dea7dffe771d8f6aba4acf84b27 (patch) | |
| tree | c9df4fe8aa6a4e9e49a5ef5a5716109051da30f2 | |
| parent | f59bebb78edb26e4f66c2754bc4d168c5d4ebb4a (diff) | |
| download | git-ml/avoid-using-grep-on-crlf-files.tar.gz | |
test-lib.sh - define and use GREP_STRIPS_CRml/avoid-using-grep-on-crlf-files
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>
| -rwxr-xr-x | t/t3032-merge-recursive-options.sh | 2 | ||||
| -rwxr-xr-x | t/t5560-http-backend-noserver.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/t/t3032-merge-recursive-options.sh b/t/t3032-merge-recursive-options.sh index 2b17311cb0..5fd7bbb652 100755 --- a/t/t3032-merge-recursive-options.sh +++ b/t/t3032-merge-recursive-options.sh @@ -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 () { diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh index ef98d95e00..9be9ae3436 100755 --- a/t/t5560-http-backend-noserver.sh +++ b/t/t5560-http-backend-noserver.sh @@ -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" | diff --git a/t/test-lib.sh b/t/test-lib.sh index 657b0bd862..6d4d11b7af 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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 |