Commit 9967a9ed authored by Michael Richardson's avatar Michael Richardson Committed by Richard Levitte
Browse files

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: default avatarAndy Polyakov <appro@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5555)
parent fb174faa

.travis-create-release.sh

+1 −1
Original line number Diff line number Diff line
@@ -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

.travis.yml

+12 −8
Original line number Diff line number Diff line
@@ -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

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -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; \