From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:28 +0000 (-0700)
Subject: Merge branch 'jk/skip-http-tests-under-no-curl' into maint
X-Git-Tag: v2.4.3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c538004ccb643388020b0e362409e469ed50d054;p=thirdparty%2Fgit.git

Merge branch 'jk/skip-http-tests-under-no-curl' into maint

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
---

c538004ccb643388020b0e362409e469ed50d054
diff --cc t/t5541-http-push-smart.sh
index 9cf27e8c99,2d378f5afc..fd7d06b9a2
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@@ -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