summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPat Thoyts <patthoyts@users.sourceforge.net>2010-09-12 10:37:24 +0100
committerPat Thoyts <patthoyts@users.sourceforge.net>2010-10-01 23:08:48 +0100
commita94114ad3d0fc584dea3ecd508135307882066a9 (patch)
treed6df8d089d246690655d3ea895bfa4b91a52147f
parent3ba9ba8f34eda286867fba37e496850dc109af74 (diff)
downloadgit-a94114ad3d0fc584dea3ecd508135307882066a9.tar.gz
Do not strip CR when grepping HTTP headers.
By default, MSYS grep reads in text-mode and converts CRLF into LF line endings. For testing HTTP use binary mode (-U) as checking is done for CR in HTTP headers Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
-rwxr-xr-xt/t5560-http-backend-noserver.sh2
-rw-r--r--t/test-lib.sh1
2 files changed, 3 insertions, 0 deletions
diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 44885b850c..4b0364374d 100755
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -5,6 +5,8 @@ test_description='test git-http-backend-noserver'
HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
+test_have_prereq MINGW && export GREP_OPTIONS=-U
+
run_backend() {
echo "$2" |
QUERY_STRING="${1#*\?}" \
diff --git a/t/test-lib.sh b/t/test-lib.sh
index a85e7954ad..2af8f10c83 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -970,6 +970,7 @@ case $(uname -s) in
# no POSIX permissions
# backslashes in pathspec are converted to '/'
# exec does not inherit the PID
+ test_set_prereq MINGW
;;
*)
test_set_prereq POSIXPERM