diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-11-29 13:27:56 -0800 |
| commit | 729fb9ad34cda2609396a61697508c61ec7d9f04 (patch) | |
| tree | ffaef10d2f6dfd2a8fd7ba5ec3b97bb3f3da26d1 /.travis.yml | |
| parent | Merge branch 'as/merge-attr-sleep' into maint (diff) | |
| parent | travis-ci: disable GIT_TEST_HTTPD for macOS (diff) | |
| download | tgif-729fb9ad34cda2609396a61697508c61ec7d9f04.tar.xz | |
Merge branch 'ls/macos-update' into maint
Portability update and workaround for builds on recent Mac OS X.
* ls/macos-update:
travis-ci: disable GIT_TEST_HTTPD for macOS
Makefile: set NO_OPENSSL on macOS by default
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 9a65514d82..0b2ea5c3e2 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-log" - - 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 |