diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2017-12-27 17:36:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 12:15:05 -0800 |
| commit | 7e72cfceed2e1e74e6bbe8ab41cacda4a66b0e4a (patch) | |
| tree | dc0693ff904d6b66601fef835f0594f348d82d70 /ci | |
| parent | 2c9a2dd0cd970816a1ddf63d9ef7a086e3202f7d (diff) | |
| download | git-7e72cfceed2e1e74e6bbe8ab41cacda4a66b0e4a.tar.gz git-7e72cfceed2e1e74e6bbe8ab41cacda4a66b0e4a.tar.xz | |
travis-ci: save prove state for the 32 bit Linux build
This change follows suit of 6272ed319 (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 <szeder.dev@gmail.com>
Reviewed-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/run-linux32-build.sh | 1 | ||||
| -rwxr-xr-x | ci/run-linux32-docker.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh index a8518eddf..c19c50c1c 100755 --- a/ci/run-linux32-build.sh +++ b/ci/run-linux32-build.sh @@ -27,6 +27,7 @@ test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) && # Build and test linux32 --32bit i386 su -m -l $CI_USER -c ' cd /usr/src/git && + ln -s /tmp/travis-cache/.prove t/.prove && make --jobs=2 && make --quiet test ' diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh index 0edf63acf..3a8b2ba42 100755 --- a/ci/run-linux32-docker.sh +++ b/ci/run-linux32-docker.sh @@ -19,5 +19,6 @@ docker run \ --env GIT_TEST_OPTS \ --env GIT_TEST_CLONE_2GB \ --volume "${PWD}:/usr/src/git" \ + --volume "${HOME}/travis-cache:/tmp/travis-cache" \ daald/ubuntu32:xenial \ /usr/src/git/ci/run-linux32-build.sh $(id -u $USER) |