Fourth batch

diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index a9ba2d9aae0427edcd6bc62c98aaee7d05090f9c..9fafcf194589218e28b894a7bd9e83c9a1893fbf 100755 (executable)
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -5,28 +5,49 @@ test_description='test git-http-backend-noserver'
 
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
 
+if test_have_prereq GREP_STRIPS_CR
+then
+       GREP_OPTIONS=-U
+       export GREP_OPTIONS
+fi
+
 run_backend() {
-       REQUEST_METHOD=GET \
-       GIT_PROJECT_ROOT="$HTTPD_DOCUMENT_ROOT_PATH" \
-       PATH_INFO="$1" \
+       echo "$2" |
+       QUERY_STRING="${1#*[?]}" \
+       PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%[?]*}" \
        git http-backend >act.out 2>act.err
 }
 
 GET() {
-       return 0
+       REQUEST_METHOD="GET" && export REQUEST_METHOD &&
+       run_backend "/repo.git/$1" &&
+       sane_unset REQUEST_METHOD &&
+       if ! grep "Status" act.out >act
+       then
+               printf "Status: 200 OK\r\n" >act
+       fi
+       printf "Status: $2\r\n" >exp &&
+       test_cmp exp act
 }
 
 POST() {
-       return 0
-}
-
-log_div() {
-       return 0
+       REQUEST_METHOD="POST" && export REQUEST_METHOD &&
+       CONTENT_TYPE="application/x-$1-request" && export CONTENT_TYPE &&
+       run_backend "/repo.git/$1" "$2" &&
+       sane_unset REQUEST_METHOD &&
+       sane_unset CONTENT_TYPE &&
+       if ! grep "Status" act.out >act
+       then
+               printf "Status: 200 OK\r\n" >act
+       fi
+       printf "Status: $3\r\n" >exp &&
+       test_cmp exp act
 }
 
 . "$TEST_DIRECTORY"/t556x_common
 
 expect_aliased() {
+       REQUEST_METHOD="GET" && export REQUEST_METHOD &&
        if test $1 = 0; then
                run_backend "$2"
        else
@@ -34,6 +55,7 @@ expect_aliased() {
                echo "fatal: '$2': aliased" >exp.err &&
                test_cmp exp.err act.err
        fi
+       unset REQUEST_METHOD
 }
 
 test_expect_success 'http-backend blocks bad PATH_INFO' '