summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2016-05-19 08:45:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-07-12 16:43:44 (GMT)
commitd9d14268309469997d8a9df5320d24ce20d1ffb7 (patch)
tree4269eb84e8a927e44a80fd24c2d77c17d98510ac /.travis.yml
parent0b65a8dbdb38962e700ee16776a3042beb489060 (diff)
downloadgit-d9d14268309469997d8a9df5320d24ce20d1ffb7.zip
git-d9d14268309469997d8a9df5320d24ce20d1ffb7.tar.gz
git-d9d14268309469997d8a9df5320d24ce20d1ffb7.tar.bz2
travis-ci: enable web server tests t55xx on Linux
Install the "apache" package to run the Git web server tests on Travis-CI Linux build machines. The tests are already executed on OS X build machines since the apache web server is installed by default. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index adab5b8..3c54080 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
apt:
packages:
- language-pack-is
+ - apache2
env:
global:
@@ -30,6 +31,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