diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:39:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-29 19:39:13 (GMT) |
| commit | 995ec8a18f60c23b80ae7ed84f8c921652a6ebb3 (patch) | |
| tree | 34c7a95ea918f38ab6724a637f3b5049d754a146 | |
| parent | 7b70d46ca410f9d37045558329c3143570d47ba6 (diff) | |
| parent | fb9d7431cf4c4d4d90ad2d2904c7feb19dfb2f8f (diff) | |
| download | git-995ec8a18f60c23b80ae7ed84f8c921652a6ebb3.zip git-995ec8a18f60c23b80ae7ed84f8c921652a6ebb3.tar.gz git-995ec8a18f60c23b80ae7ed84f8c921652a6ebb3.tar.bz2 | |
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
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | ci/run-build-and-tests.sh | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index ffb1bc4..fc5730b 100644 --- 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 cdd2913..ff0ef7f 100755 --- 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 |