Skip to content

Commit 7e72cfc

Browse files
szedergitster
authored andcommitted
travis-ci: save prove state for the 32 bit Linux build
This change follows suit of 6272ed3 (travis-ci: run previously failed tests first, then slowest to fastest, 2016-01-26), which did this for the Linux and OSX build jobs. Travis CI build jobs run the tests parallel, which is sligtly faster when tests are run in slowest to fastest order, shortening the overall runtime of this build job by about a minute / 10%. Note, that the 32 bit Linux build job runs the tests suite in a Docker container and we have to share the Travis CI cache directory with the container as a second volume. Otherwise we couldn't use a symlink pointing to the prove state file in the cache directory, because that's outside of the directory hierarchy accessible from within the container. Signed-off-by: SZEDER Gábor <[email protected]> Reviewed-by: Lars Schneider <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2c9a2dd commit 7e72cfc

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

ci/run-linux32-build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) &&
2727
# Build and test
2828
linux32 --32bit i386 su -m -l $CI_USER -c '
2929
cd /usr/src/git &&
30+
ln -s /tmp/travis-cache/.prove t/.prove &&
3031
make --jobs=2 &&
3132
make --quiet test
3233
'

ci/run-linux32-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ docker run \
1919
--env GIT_TEST_OPTS \
2020
--env GIT_TEST_CLONE_2GB \
2121
--volume "${PWD}:/usr/src/git" \
22+
--volume "${HOME}/travis-cache:/tmp/travis-cache" \
2223
daald/ubuntu32:xenial \
2324
/usr/src/git/ci/run-linux32-build.sh $(id -u $USER)

0 commit comments

Comments
 (0)