From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Aug 2016 18:55:22 +0000 (-0700)
Subject: Merge branch 'ls/travis-enable-httpd-tests' into maint
X-Git-Tag: v2.9.3~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dbc5276fedbe5ac86951a054e6e8ae610f073d9d?hp=f98a20c50a52342556f0d71a83763a61a170c26c

Merge branch 'ls/travis-enable-httpd-tests' into maint

Allow http daemon tests in Travis CI tests.

* ls/travis-enable-httpd-tests:
travis-ci: enable web server tests t55xx on Linux
---

diff --git a/.travis.yml b/.travis.yml
index c2b76f9b7e..477c3d2efb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ addons:
     packages:
     - language-pack-is
     - git-svn
+    - apache2
 
 env:
   global:
@@ -31,6 +32,7 @@ env:
     - DEFAULT_TEST_TARGET=prove
     - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
     - GIT_TEST_OPTS="--verbose --tee"
+    - GIT_TEST_HTTPD=true
     - GIT_TEST_CLONE_2GB=YesPlease
     # t9810 occasionally fails on Travis CI OS X
     # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X