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

diff --cc Makefile
Simple merge

diff --cc t/lib-httpd.sh
Simple merge

diff --cc t/t5539-fetch-http-shallow.sh
Simple merge

diff --cc t/t5541-http-push-smart.sh
index 9cf27e8c9924770b619b8e21fb22b5225e5f085f,2d378f5afcf3abde71e0bb52dc73a76132984af2..fd7d06b9a23664d0e20cc32a03955ff8816cac7f
--- 1/t/t5541-http-push-smart.sh
--- 2/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

diff --cc t/t5550-http-fetch-dumb.sh
Simple merge

diff --cc t/t5551-http-fetch-smart.sh
Simple merge