diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-08-18 09:04:17 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2019-09-05 10:56:31 +0200 |
| commit | 46c428d73633bc68377a3a425f22313584999365 (patch) | |
| tree | 2225293aac9fe826e3d0c1f2b7db2a965dd73b30 | |
| parent | c70e2ec33943d3bd46d3d9950f774307feda832b (diff) | |
Make failed messages easier to find
Now that we use travis_terminate, we can make the status messages
simpler to find, and we don't need the "OK" output.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9707)
| -rw-r--r-- | .travis.yml | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/.travis.yml b/.travis.yml index 3cc293ea52..6f97a6bebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,33 +165,24 @@ script: - if [ -n "$DESTDIR" ]; then cd _build; fi - - if $make update; then - echo -e '+\057 MAKE UPDATE OK'; - else - echo -e '+\057 MAKE UPDATE FAILED'; + - if ! $make update; then + echo -e '\052\052 FAILED -- MAKE UPDATE'; 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'; - travis_terminate 1; - fi; + - if ! git diff --exit-code; then + echo -e '\052\052 FAILED -- UPDATED FILES NOT COMMITED'; + travis_terminate 1; 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'; - travis_terminate 1; - fi; + - if test -n "$CHECKDOCS" && ! $make doc-nits; then + echo -e '\052\052 FAILED -- MAKE DOC-NITS'; + travis_terminate 1; fi - - if $make2; then - echo -e '+\057\057\057\057 MAKE OK'; - else - echo -e '+\057\057\057\057 MAKE FAILED'; + - if test -n "$GENERATE" && ! $make build_all_generated; then + echo -e '\052\052 FAILED -- MAKE BUILD_ALL_GENERATED'; + travis_terminate 1; + fi + - if ! $make2; then + echo -e '\052\052 FAILED -- MAKE'; travis_terminate 1; fi; - if [ -z "$BUILDONLY" ]; then @@ -204,32 +195,27 @@ script: if [ -e krb5/src ]; then sudo apt-get -yq install bison dejagnu gettext keyutils ldap-utils libldap2-dev libkeyutils-dev python-cjson python-paste python-pyrad slapd tcl-dev tcsh; fi; - 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'; + if ! HARNESS_VERBOSE=yes BORING_RUNNER_DIR=$top/boringssl/ssl/test/runner make test; then + echo -e '\052\052 FAILED -- MAKE TEST'; travis_terminate 1; fi; else - if $make build_tests >~/build.log 2>&1; then - echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS OK'; - else - echo -e '+\057\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; + if ! $make build_tests >~/build.log 2>&1; then + echo -e '\052\052 FAILED -- MAKE BUILD_TESTS'; cat ~/build.log travis_terminate 1; fi; fi - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; - if $make install DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then - echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL OK'; - else - echo -e '+\057\057\057\057\057\057\057 MAKE INSTALL FAILED'; + if ! $make install DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then + echo -e '\052\052 FAILED -- MAKE INSTALL'; cat ~/install.log; travis_terminate 1; fi; fi - cd $top + - echo -e '\052\052 DONE' after_success: - if [ -n "$COVERALLS" ]; then |