qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH 4/5] travis.yml: Fix the ccache lines
Date: Wed,  9 Oct 2019 19:07:00 +0200	[thread overview]
Message-ID: <20191009170701.14756-5-thuth@redhat.com> (raw)
In-Reply-To: <20191009170701.14756-1-thuth@redhat.com>

The "command -v ccache && ccache ..." likely were supposed to test
the availability of ccache before running the program. But this
shell construct causes Travis to abort if ccache is not available.
Use an if-statement instead to fix this problem.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 616e59867a..0c88e8757b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,13 +91,13 @@ git:
 
 before_script:
   - if [ "$TRAVIS_OS_NAME" == "osx" ] ; then export PATH="/usr/local/opt/ccache/libexec:$PATH" ; fi
-  - command -v ccache && ccache --zero-stats
+  - if command -v ccache ; then ccache --zero-stats ; fi
   - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
   - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
 script:
   - make -j3 && travis_retry ${TEST_CMD}
 after_script:
-  - command -v ccache && ccache --show-stats
+  - if command -v ccache ; then ccache --show-stats ; fi
 
 
 matrix:
-- 
2.18.1



  parent reply	other threads:[~2019-10-09 20:22 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-09 17:06 [PATCH 0/5] travis.yml improvements: Update libraries, build with arm64 Thomas Huth
2019-10-09 17:06 ` [PATCH 1/5] travis.yml: Add libvdeplug-dev to compile-test net/vde.c Thomas Huth
2019-10-09 17:06 ` [PATCH 2/5] travis.yml: Use libsdl2 instead of libsdl1.2, and install libsdl2-image Thomas Huth
2019-10-09 17:06 ` [PATCH 3/5] travis.yml: Use newer version of libgnutls and libpng Thomas Huth
2019-10-09 17:07 ` Thomas Huth [this message]
2019-10-09 19:04   ` [PATCH 4/5] travis.yml: Fix the ccache lines Philippe Mathieu-Daudé
2019-10-10  9:38     ` Thomas Huth
2019-10-10 11:16       ` Philippe Mathieu-Daudé
2019-10-10 11:29         ` Thomas Huth
2019-10-10 11:51           ` Philippe Mathieu-Daudé
2019-10-09 17:07 ` [PATCH 5/5] travis.yml: Compile on arm64, too Thomas Huth
2019-10-09 19:06   ` Philippe Mathieu-Daudé
2019-10-10  6:55     ` Thomas Huth
2019-10-10 10:53       ` Alex Bennée
2019-10-10 10:58   ` Daniel P. Berrangé
2019-10-10 11:57     ` Thomas Huth
2019-10-10 13:29       ` Daniel P. Berrangé
2019-10-22 10:41   ` Alex Bennée
2019-10-22 11:19     ` Thomas Huth
2019-10-16 17:56 ` [PATCH 0/5] travis.yml improvements: Update libraries, build with arm64 Alex Bennée
2019-10-21 13:53   ` Thomas Huth
2019-10-21 14:10     ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191009170701.14756-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).