[openssl] master update
Richard Levitte
levitte at openssl.org
Sun Aug 18 11:20:52 UTC 2019
The branch master has been updated
via 5be78a88aa922a6c43a83a18dbe252c6a358b8e9 (commit)
from cae665dfa6ccec743a7f39cf80676d7d2d787e56 (commit)
- Log -----------------------------------------------------------------
commit 5be78a88aa922a6c43a83a18dbe252c6a358b8e9
Author: Rich Salz <rsalz at akamai.com>
Date: Sat Aug 17 12:49:50 2019 -0400
.travis.yml: Use travis_terminate on failure
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
Reviewed-by: Paul Dale <paul.dale at oracle.com>
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9620)
-----------------------------------------------------------------------
Summary of changes:
.travis.yml | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6c828f96d4..3cc293ea52 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -168,27 +168,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
@@ -203,7 +207,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
@@ -211,7 +216,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
@@ -221,7 +226,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
More information about the openssl-commits
mailing list