summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:21:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:21:18 -0700
commit2bf3501150145d1f05678c20ab8e8d66f849851f (patch)
tree9b42d85557424e9c0836b4c47ea9d8b86ff2dc1d /t
parentMerge branch 'jm/doc-ref-prune' (diff)
parenttest-lib.sh - define and use GREP_STRIPS_CR (diff)
downloadtgif-2bf3501150145d1f05678c20ab8e8d66f849851f.tar.xz
Merge branch 'ml/avoid-using-grep-on-crlf-files'
On systems that understand a CRLF as a line ending, tests in this script that worked on files with CRLF line endings using "grep" to extract matching lines may lose the CR at the end of lines that match, causing the actual output not to match the expected output. * ml/avoid-using-grep-on-crlf-files: test-lib.sh - define and use GREP_STRIPS_CR
Diffstat (limited to 't')
-rwxr-xr-xt/t3032-merge-recursive-options.sh2
-rwxr-xr-xt/t5560-http-backend-noserver.sh2
-rw-r--r--t/test-lib.sh2
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 b490283182..1aa27bdbbf 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -825,6 +825,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
@@ -832,6 +833,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