wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

.travis.yml: Use travis_terminate on failure

Browse source 
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)
This commit is contained in:
Rich Salz 2019-08-17 12:49:50 -04:00 committed by Richard Levitte
parent cae665dfa6
commit 5be78a88aa
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.travis.yml
View file

@ -168,27 +168,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
@ -203,7 +207,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
@ -211,7 +216,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
@ -221,7 +226,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