diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-08-17 12:49:50 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-08-18 13:21:29 +0200 |
| commit | ec9cbe21519f85e65e2f128d3f04bfd904642079 (patch) | |
| tree | 19cc63e4a695adc51e8575ece6299a26c43dcfbf /.travis.yml | |
| parent | 2403153c95b312e0a5a178c516335ee8dd17526c (diff) | |
.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)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index c79040ded5..b9a2f58776 100644 --- 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 |