git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: tboegi@web.de, gitster@pobox.com,
	Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS
Date: Sun, 16 Oct 2016 17:25:50 -0700	[thread overview]
Message-ID: <20161017002550.88782-3-larsxschneider@gmail.com> (raw)
In-Reply-To: <20161017002550.88782-1-larsxschneider@gmail.com>

From: Lars Schneider <larsxschneider@gmail.com>

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>
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 37a1e1f..d752447 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
-- 
2.10.0


  parent reply	other threads:[~2016-10-17  0:26 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-17  0:25 [PATCH v1 0/2] Fix default macOS build locally and on Travis CI larsxschneider
2016-10-17  0:25 ` [PATCH v1 1/2] config.mak.in: set NO_OPENSSL and APPLE_COMMON_CRYPTO for macOS >10.11 larsxschneider
2016-10-17  9:50   ` Jeff King
2016-11-06 19:35     ` Lars Schneider
2016-11-07 17:26       ` Jeff King
2016-11-07 17:36         ` Paul Smith
2016-11-07 17:46           ` Jeff King
2016-11-07 17:49             ` Paul Smith
2016-11-09  8:18         ` Torsten Bögershausen
2016-11-09  9:29           ` Lars Schneider
2016-11-09 10:51             ` Torsten Bögershausen
2016-11-10 11:13               ` [PATCH v2] Makefile: set NO_OPENSSL on macOS by default larsxschneider
2016-10-17  0:25 ` larsxschneider [this message]
2016-11-06 21:42   ` [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS Lars Schneider
2016-11-07 21:20     ` Jeff King
2016-11-10 11:07       ` Lars Schneider
2016-11-10 16:10         ` Jeff King
2016-11-10 21:33           ` Junio C Hamano
2016-11-10 21:43             ` Jeff King
2016-11-10 21:49               ` Junio C Hamano
2016-11-10 21:54                 ` Jeff King
2016-11-11  8:22           ` Lars Schneider
2016-11-11  8:47             ` Jeff King
2016-11-11  9:13               ` Lars Schneider
2016-11-11  9:28                 ` Jeff King
2016-11-15 12:07             ` Heiko Voigt
2016-11-15 14:18               ` Lars Schneider
2016-11-15 15:31               ` Jeff King
2016-11-16 14:39                 ` Heiko Voigt
2016-11-16 20:01                   ` Torsten Bögershausen
2016-11-09 23:39 ` [PATCH v1 0/2] Fix default macOS build locally and on Travis CI Junio C Hamano
2016-11-10  6:41   ` Torsten Bögershausen
2016-11-10 11:19   ` Lars Schneider
2016-11-10 21:34     ` Junio C Hamano
2016-11-11  9:01       ` Lars Schneider

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20161017002550.88782-3-larsxschneider@gmail.com \
    --to=larsxschneider@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=tboegi@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).