Skip to content

Commit a296bc0

Browse files
larsxschneidergitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent f01fe92 commit a296bc0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ env:
3232
- DEFAULT_TEST_TARGET=prove
3333
- GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
3434
- GIT_TEST_OPTS="--verbose --tee"
35-
- GIT_TEST_HTTPD=true
3635
- GIT_TEST_CLONE_2GB=YesPlease
3736
# t9810 occasionally fails on Travis CI OS X
3837
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
@@ -57,6 +56,8 @@ before_install:
5756
- >
5857
case "${TRAVIS_OS_NAME:-linux}" in
5958
linux)
59+
export GIT_TEST_HTTPD=YesPlease
60+
6061
mkdir --parents custom/p4
6162
pushd custom/p4
6263
wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d

0 commit comments

Comments
 (0)