Commit ec9cbe21 authored by Rich Salz's avatar Rich Salz Committed by Richard Levitte
Browse files

.travis.yml: Use travis_terminate on failure 



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

(cherry picked from commit 5be78a88aa922a6c43a83a18dbe252c6a358b8e9)
parent 2403153c

.travis.yml

+12 −7
Original line number Original line Diff line number Diff line
@@ -198,27 +198,31 @@ script: 
    - if $make update; then

    - if $make update; then

          echo -e '+\057 MAKE UPDATE OK';

          echo -e '+\057 MAKE UPDATE OK';

      else

      else

          echo -e '+\057 MAKE UPDATE FAILED'; false;

          echo -e '+\057 MAKE UPDATE FAILED';

          travis_terminate 1;

      fi

      fi

    - git diff --exit-code

    - git diff --exit-code

    - if [ -n "$CHECKDOCS" ]; then

    - if [ -n "$CHECKDOCS" ]; then

          if $make doc-nits; then

          if $make doc-nits; then

              echo -e '+\057\057 MAKE DOC-NITS OK';

              echo -e '+\057\057 MAKE DOC-NITS OK';

          else

          else

              echo -e '+\057\057 MAKE DOC-NITS FAILED'; false;

              echo -e '+\057\057 MAKE DOC-NITS FAILED';

              travis_terminate 1;

          fi;

          fi;

      fi

      fi

    - if [ -n "$GENERATE" ]; then

    - if [ -n "$GENERATE" ]; then

          if $make build_all_generated; then

          if $make build_all_generated; then

              echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED OK';

              echo -e '+\057\057\057 MAKE BUILD_ALL_GENERATED OK';

          else

          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;

      fi

      fi

    - if $make2; then

    - if $make2; then

          echo -e '+\057\057\057\057 MAKE OK';

          echo -e '+\057\057\057\057 MAKE OK';

      else

      else

          echo -e '+\057\057\057\057 MAKE FAILED'; false;

          echo -e '+\057\057\057\057 MAKE FAILED';

          travis_terminate 1;

      fi;

      fi;

    - if [ -z "$BUILDONLY" ]; then

    - if [ -z "$BUILDONLY" ]; then

          if [ -n "$CROSS_COMPILE" ]; 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

          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';

              echo -e '+\057\057\057\057\057 MAKE TEST OK';

          else

          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;

          fi;

      else

      else

          if $make build_tests >~/build.log 2>&1; then

          if $make build_tests >~/build.log 2>&1; then
@@ -241,7 +246,7 @@ script: 
          else

          else

              echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS FAILED';

              echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS FAILED';

              cat ~/build.log

              cat ~/build.log

              false;

              travis_terminate 1;

          fi;

          fi;

      fi

      fi

    - if [ -n "$DESTDIR" ]; then

    - if [ -n "$DESTDIR" ]; then
@@ -251,7 +256,7 @@ script: 
          else

          else

              echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED';

              echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED';

              cat ~/install.log;

              cat ~/install.log;

              false;

              travis_terminate 1;

          fi;

          fi;

      fi

      fi

    - cd $top

    - cd $top