Browse Source

Merge branch 'jk/t5561-missing-curl'

Test fixes.

* jk/t5561-missing-curl:
  t5561: skip tests if curl is not available
  t5561: drop curl stderr redirects
maint
Junio C Hamano 7 years ago
parent
commit
e6986abb77
  1. 10
      t/t5561-http-backend.sh
  2. 4
      t/test-lib.sh

10
t/t5561-http-backend.sh

@ -3,10 +3,16 @@ @@ -3,10 +3,16 @@
test_description='test git-http-backend'
. ./test-lib.sh
. "$TEST_DIRECTORY"/lib-httpd.sh

if ! test_have_prereq CURL; then
skip_all='skipping raw http-backend tests, curl not available'
test_done
fi

start_httpd

GET() {
curl --include "$HTTPD_URL/$SMART/repo.git/$1" >out 2>/dev/null &&
curl --include "$HTTPD_URL/$SMART/repo.git/$1" >out &&
tr '\015' Q <out |
sed '
s/Q$//
@ -19,7 +25,7 @@ GET() { @@ -19,7 +25,7 @@ GET() {
POST() {
curl --include --data "$2" \
--header "Content-Type: application/x-$1-request" \
"$HTTPD_URL/smart/repo.git/$1" >out 2>/dev/null &&
"$HTTPD_URL/smart/repo.git/$1" >out &&
tr '\015' Q <out |
sed '
s/Q$//

4
t/test-lib.sh

@ -1208,3 +1208,7 @@ test_lazy_prereq LONG_IS_64BIT ' @@ -1208,3 +1208,7 @@ test_lazy_prereq LONG_IS_64BIT '

test_lazy_prereq TIME_IS_64BIT 'test-tool date is64bit'
test_lazy_prereq TIME_T_IS_64BIT 'test-tool date time_t-is64bit'

test_lazy_prereq CURL '
curl --version
'

Loading…
Cancel
Save