diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:25 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 09:05:25 +0300 |
commit | 51b996662bb5ac055cf9639eb0f0a1fc5876a4aa (patch) | |
tree | 6ae54faf68dde0e109d01f58f71618718f7e0ee1 | |
parent | 5fda343321f36384892061b21dcbe1d477145d2c (diff) | |
parent | 2c8921db2b86fa5153ce642c9dd285d9500117fc (diff) |
Merge branch 'sg/travis-specific-cc'
The travis CI scripts have been corrected to build Git with the
compiler(s) of our choice.
* sg/travis-specific-cc:
travis-ci: build with the right compiler
travis-ci: switch to Xcode 10.1 macOS image
travis-ci: don't be '--quiet' when running the tests
.gitignore: ignore external debug symbols from GCC on macOS
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | ci/install-dependencies.sh | 5 | ||||
-rwxr-xr-x | ci/lib-travisci.sh | 15 | ||||
-rwxr-xr-x | ci/run-build-and-tests.sh | 4 | ||||
-rwxr-xr-x | ci/run-linux32-build.sh | 2 |
6 files changed, 23 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 6fd61c7272..7374587f9d 100644 --- a/.gitignore +++ b/.gitignore @@ -229,3 +229,4 @@ *.pdb /Debug/ /Release/ +*.dSYM diff --git a/.travis.yml b/.travis.yml index 03c8e4c613..36cbdea7f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,8 @@ os: - linux - osx +osx_image: xcode10.1 + compiler: - clang - gcc diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 06c3546e1e..dc719876bb 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -40,6 +40,11 @@ osx-clang|osx-gcc) brew install git-lfs gettext brew link --force gettext brew install caskroom/cask/perforce + case "$jobname" in + osx-gcc) + brew link gcc@8 + ;; + esac ;; StaticAnalysis) sudo apt-get -q update diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh index 69dff4d1ec..a479613a57 100755 --- a/ci/lib-travisci.sh +++ b/ci/lib-travisci.sh @@ -99,12 +99,14 @@ export DEFAULT_TEST_TARGET=prove export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" export GIT_TEST_OPTS="--verbose-log -x --immediate" export GIT_TEST_CLONE_2GB=YesPlease -if [ "$jobname" = linux-gcc ]; then - export CC=gcc-8 -fi case "$jobname" in linux-clang|linux-gcc) + if [ "$jobname" = linux-gcc ] + then + export CC=gcc-8 + fi + export GIT_TEST_HTTPD=YesPlease # The Linux build installs the defined dependency versions below. @@ -118,6 +120,11 @@ linux-clang|linux-gcc) export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH" ;; osx-clang|osx-gcc) + if [ "$jobname" = osx-gcc ] + then + export CC=gcc-8 + fi + # t9810 occasionally fails on Travis CI OS X # t9816 occasionally fails with "TAP out of sequence errors" on # Travis CI OS X @@ -127,3 +134,5 @@ GIT_TEST_GETTEXT_POISON) export GIT_TEST_GETTEXT_POISON=YesPlease ;; esac + +export MAKEFLAGS="CC=${CC:-cc}" diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh index cda170d5c2..84431c097e 100755 --- a/ci/run-build-and-tests.sh +++ b/ci/run-build-and-tests.sh @@ -8,7 +8,7 @@ ln -s "$cache_dir/.prove" t/.prove make --jobs=2 -make --quiet test +make test if test "$jobname" = "linux-gcc" then export GIT_TEST_SPLIT_INDEX=yes @@ -17,7 +17,7 @@ then export GIT_TEST_OE_DELTA_SIZE=5 export GIT_TEST_COMMIT_GRAPH=1 export GIT_TEST_MULTI_PACK_INDEX=1 - make --quiet test + make test fi check_unignored_build_artifacts diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index 2c60d2e70a..26c168a016 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -56,5 +56,5 @@ linux32 --32bit i386 su -m -l $CI_USER -c ' cd /usr/src/git test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove make --jobs=2 - make --quiet test + make test ' |