From a4ffbbeef6ccf2f273ecaae3883ae7644ab5b417 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 15 Aug 2016 18:45:22 +0200 Subject: [PATCH] Make "make" less verbose in Travis, except for the build only case MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Emilia Käsper --- .travis.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index b1d418ff32..e73a4a050f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,25 +100,30 @@ before_script: - cd $top script: + - if [ -z "$BUILDONLY" ]; then + make="make -s"; + else + make="make"; + fi - if [ -n "$DESTDIR" ]; then cd _build; top=..; else top=.; fi - - make update - - make + - $make update + - $make - if [ -z "$BUILDONLY" ]; then if [ -n "$CROSS_COMPILE" ]; then export EXE_SHELL="wine" WINEPREFIX=`pwd`; fi; HARNESS_VERBOSE=yes make test; else - make build_tests; + $make build_tests; fi - if [ -n "$DESTDIR" ]; then mkdir "../$DESTDIR"; - make install install_docs DESTDIR="../$DESTDIR"; + $make install install_docs DESTDIR="../$DESTDIR"; fi - cd $top -- 2.25.1