Merge branch 'sg/travis-gcc-4.8'

Add a job to build with a tad older GCC to make sure we are still
buildable.

* sg/travis-gcc-4.8:
travis-ci: build with GCC 4.8 as well

diff --git a/.travis.yml b/.travis.yml
index ffb1bc46f2d9605f7c3fba478f918fcc288bbdd6..fc5730b085f117a16fb665a060b61e73ec18ba6c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,6 +21,10 @@ matrix:
       compiler:
       addons:
       before_install:
+    - env: jobname=linux-gcc-4.8
+      os: linux
+      dist: trusty
+      compiler:
     - env: jobname=Linux32
       os: linux
       compiler:

diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index cdd291344047394b26c17635d4507ad7ce14b542..ff0ef7f08e759059a9e0053946f2f1cda3c26026 100755 (executable)
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -11,9 +11,9 @@ windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
 esac
 
 make
-make test
-if test "$jobname" = "linux-gcc"
-then
+case "$jobname" in
+linux-gcc)
+       make test
        export GIT_TEST_SPLIT_INDEX=yes
        export GIT_TEST_FULL_IN_PACK_ARRAY=true
        export GIT_TEST_OE_SIZE=10
@@ -21,7 +21,16 @@ then
        export GIT_TEST_COMMIT_GRAPH=1
        export GIT_TEST_MULTI_PACK_INDEX=1
        make test
-fi
+       ;;
+linux-gcc-4.8)
+       # Don't run the tests; we only care about whether Git can be
+       # built with GCC 4.8, as it errors out on some undesired (C99)
+       # constructs that newer compilers seem to quietly accept.
+       ;;
+*)
+       make test
+       ;;
+esac
 
 check_unignored_build_artifacts