travis-ci: disable GIT_TEST_HTTPD for macOS
TravisCI changed their default macOS image from 10.10 to 10.11 [1]. Unfortunately the HTTPD tests do not run out of the box using the pre-installed Apache web server anymore. Therefore we enable these tests only for Linux and disable them for macOS. [1] https://blog.travis-ci.com/2016-10-04-osx-73-default-image-live/ Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Lars Schneider committed
Oct 16, 2016 at 17:25 UTC
a296bc01329b9e2aa91255c88626e8c8f831e428
1 file changed
+2
-1
.travis.yml
+2
-1
@@ -32,7 +32,6 @@ env:
32
- DEFAULT_TEST_TARGET=prove
33
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
34
- GIT_TEST_OPTS="--verbose --tee"
35
- - GIT_TEST_HTTPD=true
35
- GIT_TEST_CLONE_2GB=YesPlease
36
# t9810 occasionally fails on Travis CI OS X
37
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
@@ -57,6 +56,8 @@ before_install:
56
- >
57
case "${TRAVIS_OS_NAME:-linux}" in
58
linux)
59
+ export GIT_TEST_HTTPD=YesPlease
60
+
61
mkdir --parents custom/p4
62
pushd custom/p4
63
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d