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 /git-rebase--merge.sh | |
parent | Makefile: set NO_OPENSSL on macOS by default (diff) | |
download | tgif-a296bc01329b9e2aa91255c88626e8c8f831e428.tar.xz |
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>
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions