summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-11-11 21:56:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-11-11 21:56:30 (GMT)
commit332fd5655a1e162b2fe47009dfc77ca2a94908e7 (patch)
treeb41171cbf1491fcfa389cf31a25b99f41b3620eb /.travis.yml
parent5de732f647609de15f51e98b9c9de07115b58b5c (diff)
parenta296bc01329b9e2aa91255c88626e8c8f831e428 (diff)
downloadgit-332fd5655a1e162b2fe47009dfc77ca2a94908e7.zip
git-332fd5655a1e162b2fe47009dfc77ca2a94908e7.tar.gz
git-332fd5655a1e162b2fe47009dfc77ca2a94908e7.tar.bz2
Merge branch 'ls/macos-update'
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.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 9a65514..0b2ea5c 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