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

diff --cc ci/run-tests.sh
index 9b6fedcc2a94b83f7243767915ad0327e100ef13,deba73d9b59820dd2ad427bbd39fa8afb3a21ef2..73e273fac73c48b4963e7aa7c5040f17f220b7da
--- 1/ci/run-tests.sh
--- 2/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