Make sure we use the libctx when creating an EVP_PKEY_CTX in libssl

[thirdparty/openssl.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index b6d698ae769f16ab136b7e653bf5933216997c78..e6817e4d8251290eb44f9739b65d5b3a37bbfe81 100644 (file)
--- 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}"
 
@@ -65,7 +65,7 @@ matrix:
         - os: linux
           arch: arm64
           compiler: gcc
-          env: CONFIG_OPTS="no-asm no-deprecated enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" NOUPDATE="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
+          env: CONFIG_OPTS="no-asm no-deprecated enable-buildtest-c++ --strict-warnings -D_DEFAULT_SOURCE" BUILDONLY="yes" CHECKDOCS="yes" CPPFLAGS="-ansi"
         - os: linux
           arch: s390x
           compiler: gcc
@@ -170,10 +170,10 @@ before_script:
     - if [ -n "$DESTDIR" ]; then
           sh .travis-create-release.sh $TRAVIS_OS_NAME;
           tar -xzf _srcdist.tar.gz;
-          mkdir _build;
-          cd _build;
-          srcdir=../_srcdist;
-          top=..;
+          mkdir -p _build/tree;
+          cd _build/tree;
+          srcdir=../../_srcdist;
+          top=../..;
       else
           srcdir=.;
           top=.;
@@ -210,9 +210,9 @@ script:
       fi
     - top=${PWD}
     - if [ -n "$DESTDIR" ]; then
-          cd _build;
+          cd _build/tree;
       fi
-    - if [ -z "$NOUPDATE" ] && ! $make update; then
+    - if ! $make update; then
           echo -e '\052\052 FAILED -- MAKE UPDATE';
           travis_terminate 1;
       fi
@@ -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;