.travis.yml: Use travis_terminate on failure

Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9620)

(cherry picked from commit 5be78a88aa922a6c43a83a18dbe252c6a358b8e9)

diff --git a/.travis.yml b/.travis.yml
index c79040ded53c04dc55acbf84a78922922e65586f..b9a2f58776222f5831dc64a86681cdaa055c7281 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -198,27 +198,31 @@ script:
     - if $make update; then
           echo -e '+\057 MAKE UPDATE OK';
       else
-          echo -e '+\057 MAKE UPDATE FAILED'; false;
+          echo -e '+\057 MAKE UPDATE FAILED';
+          travis_terminate 1;
       fi
     - git diff --exit-code
     - if [ -n "$CHECKDOCS" ]; then
           if $make doc-nits; then
               echo -e '+\057\057 MAKE DOC-NITS OK';
           else
-              echo -e '+\057\057 MAKE DOC-NITS FAILED'; false;
+              echo -e '+\057\057 MAKE DOC-NITS FAILED';
+              travis_terminate 1;
           fi;
       fi
     - if [ -n "$GENERATE" ]; then
           if $make build_all_generated; then
               echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED OK';
           else
-              echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED FAILED'; false;
+              echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED FAILED';
+              travis_terminate 1;
           fi;
       fi
     - if $make2; then
           echo -e '+\057\057\057\057 MAKE OK';
       else
-          echo -e '+\057\057\057\057 MAKE FAILED'; false;
+          echo -e '+\057\057\057\057 MAKE FAILED';
+          travis_terminate 1;
       fi;
     - if [ -z "$BUILDONLY" ]; then
           if [ -n "$CROSS_COMPILE" ]; then
@@ -233,7 +237,8 @@ script:
           if HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; then
               echo -e '+\057\057\057\057\057 MAKE TEST OK';
           else
-              echo -e '+\057\057\057\057\057 MAKE TEST FAILED'; false;
+              echo -e '+\057\057\057\057\057 MAKE TEST FAILED';
+              travis_terminate 1;
           fi;
       else
           if $make build_tests >~/build.log 2>&1; then
@@ -241,7 +246,7 @@ script:
           else
               echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS FAILED';
               cat ~/build.log
-              false;
+              travis_terminate 1;
           fi;
       fi
     - if [ -n "$DESTDIR" ]; then
@@ -251,7 +256,7 @@ script:
           else
               echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED';
               cat ~/install.log;
-              false;
+              travis_terminate 1;
           fi;
       fi
     - cd $top