diff options
| author | Lars Schneider <larsxschneider@gmail.com> | 2016-10-16 17:25:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-10 11:13:14 -0800 |
| commit | a296bc01329b9e2aa91255c88626e8c8f831e428 (patch) | |
| tree | 66ec31477c7eea7f702c50062b64ed5aa49f17ee | |
| parent | f01fe92b82be0c3ff1569a2fc719162758bba065 (diff) | |
| download | git-ls/macos-update.tar.gz | |
travis-ci: disable GIT_TEST_HTTPD for macOSls/macos-update
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>
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 477c3d2efb..684ecfdd36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ 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 @@ -57,6 +56,8 @@ before_install: - > case "${TRAVIS_OS_NAME:-linux}" in linux) + export GIT_TEST_HTTPD=YesPlease + mkdir --parents custom/p4 pushd custom/p4 wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d |