From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 7 Feb 2018 22:56:01 +0000 (-0800)
Subject: Merge branch 'sg/travis-linux32-sanity' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0349cf505c1e0a4912c62e5fd069cfa489e287fd?hp=--cc

Merge branch 'sg/travis-linux32-sanity' into next

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
---

0349cf505c1e0a4912c62e5fd069cfa489e287fd
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