From: Junio C Hamano Date: Tue, 13 Feb 2018 21:39:16 +0000 (-0800) Subject: Merge branch 'sg/travis-linux32-sanity' X-Git-Tag: v2.17.0-rc0~106 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/798224a1c97ccdeb5f80d97914c7447e356670ac Merge branch 'sg/travis-linux32-sanity' Travis updates. * sg/travis-linux32-sanity: travis-ci: don't fail if user already exists on 32 bit Linux build job travis-ci: don't run the test suite as root in the 32 bit Linux build travis-ci: don't repeat the path of the cache directory travis-ci: use 'set -e' in the 32 bit Linux build job travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build --- 798224a1c97ccdeb5f80d97914c7447e356670ac diff --cc ci/run-tests.sh index 9b6fedcc2a,deba73d9b5..73e273fac7 --- a/ci/run-tests.sh +++ b/ci/run-tests.sh @@@ -5,12 -5,9 +5,13 @@@ . ${0%/*}/lib-travisci.sh - ln -s $HOME/travis-cache/.prove t/.prove + ln -s "$cache_dir/.prove" t/.prove + make --quiet test +if test "$jobname" = "linux-gcc" +then + GIT_TEST_SPLIT_INDEX=YesPlease make --quiet test +fi check_unignored_build_artifacts