summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 18:55:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-08-10 18:55:23 (GMT)
commitdbc5276fedbe5ac86951a054e6e8ae610f073d9d (patch)
tree810357e2e33d30ac8815fbca979628da6e372f1a /.travis.yml
parentf98a20c50a52342556f0d71a83763a61a170c26c (diff)
parentd9d14268309469997d8a9df5320d24ce20d1ffb7 (diff)
downloadgit-dbc5276fedbe5ac86951a054e6e8ae610f073d9d.zip
git-dbc5276fedbe5ac86951a054e6e8ae610f073d9d.tar.gz
git-dbc5276fedbe5ac86951a054e6e8ae610f073d9d.tar.bz2
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
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 c2b76f9..477c3d2 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