Merge branch 'jk/skip-http-tests-under-no-curl'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:44 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:44 +0000 (12:41 -0700)
Test clean-up.

* jk/skip-http-tests-under-no-curl:
  tests: skip dav http-push tests under NO_EXPAT=NoThanks
  t/lib-httpd.sh: skip tests if NO_CURL is defined

1  2 
Makefile
t/lib-httpd.sh
t/t5539-fetch-http-shallow.sh
t/t5541-http-push-smart.sh
t/t5550-http-fetch-dumb.sh
t/t5551-http-fetch-smart.sh

diff --cc Makefile
Simple merge
diff --cc t/lib-httpd.sh
Simple merge
Simple merge
@@@ -6,13 -6,7 +6,8 @@@
  test_description='test smart pushing over http via http-backend'
  . ./test-lib.sh
  
- if test -n "$NO_CURL"; then
-       skip_all='skipping test, git built without http support'
-       test_done
- fi
  ROOT_PATH="$PWD"
 +. "$TEST_DIRECTORY"/lib-gpg.sh
  . "$TEST_DIRECTORY"/lib-httpd.sh
  . "$TEST_DIRECTORY"/lib-terminal.sh
  start_httpd
Simple merge
Simple merge