The branch master has been updated
via cde63b731575e6be41b3f94bcd9fa941cdc45488 (commit)
from 244bc29746c83e76e2fba542ca87552b8aef5c5f (commit)
- Log -----------------------------------------------------------------
commit cde63b731575e6be41b3f94bcd9fa941cdc45488
Author: Rich Salz <[email protected]>
Date: Wed Mar 11 14:17:00 2020 -0400
Extend Travis build time-out
- Add travis_wait to the build command
- And travis_retry to some apt-get commands.
- Use `make _tests` instead of `make test`
Reviewed-by: Richard Levitte <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/11319)
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index f77f8c7586..e6817e4d82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,10 @@ git:
before_install:
- if [ -n "$COVERALLS" ]; then
- pip install --user cpp-coveralls;
+ travis_retry pip install --user cpp-coveralls;
fi;
- if expr "$CONFIG_OPTS" ":" ".*enable-external-tests" > /dev/null; then
- git submodule update --init --recursive;
+ travis_retry git submodule update --init --recursive;
fi;
- eval "${MATRIX_EVAL}"
@@ -246,7 +246,7 @@ script:
if [ -e krb5/src ]; then
sudo apt-get -yq install bison dejagnu gettext keyutils
ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad
slapd tcl-dev tcsh;
fi;
- if ! HARNESS_VERBOSE_FAILURE=yes
BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; then
+ if ! HARNESS_VERBOSE_FAILURE=yes
BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner travis_wait 60 make _tests;
then
echo -e '\052\052 FAILED -- MAKE TEST';
travis_terminate 1;
fi;
