diff options
| author | Michael Richardson <mcr@sandelman.ca> | 2018-03-06 14:18:43 -0500 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-03-08 21:18:35 +0100 |
| commit | 9967a9edbefcec14f19b64e4bae7a2b5fb0da612 (patch) | |
| tree | eaa0b20e7db592c10022bea7299a47b75955be8d | |
| parent | fb174faaf51d8b11046873a6a51fc2d8d8c28952 (diff) | |
Reduce travis-ci log output
Travis-ci log output is huge and overflows internal travis-ci view,
which makes it hard to find errors.
Redirect some output to a file and dump it only if it fails.
Remove "v" option from tar that builds and extracts the srcdist.
While running the tests manually, some non-POSIX (bashisms) with ==
vs = came to light.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5555)
| -rw-r--r-- | .travis-create-release.sh | 2 | ||||
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 |
3 files changed, 14 insertions, 10 deletions
diff --git a/.travis-create-release.sh b/.travis-create-release.sh index 311cedd69c..b39a00137a 100644 --- a/.travis-create-release.sh +++ b/.travis-create-release.sh @@ -5,7 +5,7 @@ ./Configure dist if [ "$1" == osx ]; then make NAME='_srcdist' TARFILE='_srcdist.tar' \ - TAR_COMMAND='$(TAR) $(TARFLAGS) -cvf -' tar + TAR_COMMAND='$(TAR) $(TARFLAGS) -cf -' tar else make TARFILE='_srcdist.tar' NAME='_srcdist' dist fi diff --git a/.travis.yml b/.travis.yml index 0586fb3e51..6c0468a983 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_script: fi - if [ -n "$DESTDIR" ]; then sh .travis-create-release.sh $TRAVIS_OS_NAME; - tar -xvzf _srcdist.tar.gz; + tar -xzf _srcdist.tar.gz; mkdir _build; cd _build; srcdir=../_srcdist; @@ -133,14 +133,14 @@ before_script: srcdir=.; top=.; fi - - if [ "$CC" == i686-w64-mingw32-gcc ]; then + - if [ "$CC" = i686-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw $CONFIG_OPTS -Wno-pedantic-ms-format; - elif [ "$CC" == x86_64-w64-mingw32-gcc ]; then + elif [ "$CC" = x86_64-w64-mingw32-gcc ]; then export CROSS_COMPILE=${CC%%gcc}; unset CC; $srcdir/Configure mingw64 $CONFIG_OPTS -Wno-pedantic-ms-format; else - if [ "$CC" == clang-3.9 ]; then + if [ "$CC" = clang-3.9 ]; then sudo cp .travis-apt-pin.preferences /etc/apt/preferences.d/no-ubuntu-clang; curl -sSL "http://apt.llvm.org/llvm-snapshot.gpg.key" | sudo -E apt-key add -; echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main" | sudo tee -a /etc/apt/sources.list > /dev/null; @@ -199,18 +199,22 @@ script: echo -e '+\057\057\057\057 MAKE TEST FAILED'; false; fi; else - if $make build_tests; then + if $make build_tests >~/build.log 2>&1; then echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS OK'; else - echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; false; + echo -e '+\057\057\057\057\057 MAKE BUILD_TESTS FAILED'; + cat ~/build.log + false; fi; fi - if [ -n "$DESTDIR" ]; then mkdir "$top/$DESTDIR"; - if $make install install_docs DESTDIR="$top/$DESTDIR"; then + if $make install install_docs DESTDIR="$top/$DESTDIR" >~/install.log 2>&1 ; then echo -e '+\057\057\057\057\057\057 MAKE INSTALL OK'; else - echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; false; + echo -e '+\057\057\057\057\057\057 MAKE INSTALL FAILED'; + cat ~/install.log; + false; fi; fi - cd $top diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 588c6c11e3..fc483f0ff9 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -787,7 +787,7 @@ tags TAGS: FORCE # If your tar command doesn't support --owner and --group, make sure to # use one that does, for example GNU tar -TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cvf - +TAR_COMMAND=$(TAR) $(TARFLAGS) --owner 0 --group 0 -cf - PREPARE_CMD=: tar: set -e; \ |