Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS
- From
Lars Schneider <larsxschneider@gmail.com>
- Date
- Nov 6, 2016, 21:42 UTC
- Message-ID
- <203BDCB2-1975-4590-B4B8-3C5E9D210430@gmail.com>
- In-Reply-To
- <20161017002550.88782-3-larsxschneider@gmail.com>
Show 40 quoted lines
> On 17 Oct 2016, at 02:25, larsxschneider@gmail.com wrote:
>
> 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
> Hi Junio,
the patch above is one of two patches to make TravisCI pass, again. Could you queue it?
The other patch is [1] which is still under discussion.
Thank you, Lars
[1] http://public-inbox.org/git/8C67FF53-C26F-4993-908F-A5183C5E48D9@gmail.com/