Andrew's git / gitweb.git / diff
?
Merge branch 'ls/macos-update' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:56 +0000 (13:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Nov 2016 21:27:56 +0000 (13:27 -0800)
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

1  2 
.travis.yml patch | diff1 | diff2 | blob | history
Makefile patch | diff1 | diff2 | blob | history
diff --cc .travis.yml
index 9a65514d829987eb8a0274c12f094381d90e87be,684ecfdd3613849a76260c51ed858a9365d681e2..0b2ea5c3e2daa057cb88763f1943f6a250d019d9
--- 1/.travis.yml
--- 2/.travis.yml
+++ b/.travis.yml
@@@ -31,8 -31,7 +31,7 @@@ env
      - LINUX_GIT_LFS_VERSION="1.2.0"
      - DEFAULT_TEST_TARGET=prove
      - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
 -    - GIT_TEST_OPTS="--verbose --tee"
 +    - 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
diff --cc Makefile
Simple merge