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

diff --git a/.gitignore b/.gitignore
index 6fd61c7272fb460c50cc0b1e3a08ce97a6cf912f..7374587f9df901cba0a6990ad48fac17f8a5be57 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -229,3 +229,4 @@
 *.pdb
 /Debug/
 /Release/
+*.dSYM

diff --git a/.travis.yml b/.travis.yml
index 03c8e4c613015476fffe3f1e071c0c9d6609df0e..36cbdea7f4f37e7eb4d5172daa4431cffcb4b46c 100644 (file)
--- 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 06c3546e1ed4e1a78cea4d7a1801145066a895d8..dc719876bb12309c086952d275085d8d3d0690e6 100755 (executable)
--- 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 69dff4d1ecb4b21c32f8127d78a87a925e9390c5..a479613a5748858774994f67fdcd29600b95d1ba 100755 (executable)
--- 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 cda170d5c27bab7c511d6fe70fc9852b21cc0180..84431c097eb8dffa1b540ee61d6c047239afd18a 100755 (executable)
--- 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 2c60d2e70ae56b59b1ff8046a21b9bc4bf87e3e6..26c168a0165522655e4e80988ba553b314b333f5 100755 (executable)
--- 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
 '