qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, "Thomas Huth" <thuth@redhat.com>,
	berrange@redhat.com, stefanb@linux.vnet.ibm.com,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	richard.henderson@linaro.org, f4bug@amsat.org,
	"Alex Bennée" <alex.bennee@linaro.org>,
	cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com,
	pbonzini@redhat.com, aurelien@aurel32.net
Subject: [PATCH  v2 05/17] travis.yml: Fix the ccache lines
Date: Thu, 24 Oct 2019 11:22:28 +0100	[thread overview]
Message-ID: <20191024102240.2778-6-alex.bennee@linaro.org> (raw)
In-Reply-To: <20191024102240.2778-1-alex.bennee@linaro.org>

From: Thomas Huth <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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20191009170701.14756-5-thuth@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e65e53f3d7e..7e0d4ad2b31 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.20.1



  parent reply	other threads:[~2019-10-24 10:40 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-24 10:22 [PATCH for 4.2 v2 00/17] testing/next Alex Bennée
2019-10-24 10:22 ` [PATCH v2 01/17] travis.yml: reduce scope of the --enable-debug build Alex Bennée
2019-10-24 10:22 ` [PATCH v2 02/17] travis.yml: Add libvdeplug-dev to compile-test net/vde.c Alex Bennée
2019-10-24 14:37   ` Philippe Mathieu-Daudé
2019-10-24 10:22 ` [PATCH v2 03/17] travis.yml: Use libsdl2 instead of libsdl1.2, and install libsdl2-image Alex Bennée
2019-10-24 10:22 ` [PATCH v2 04/17] travis.yml: Use newer version of libgnutls and libpng Alex Bennée
2019-10-24 10:22 ` Alex Bennée [this message]
2019-10-24 10:22 ` [PATCH v2 06/17] travis.yml: Test the release tarball Alex Bennée
2019-10-24 10:22 ` [PATCH v2 07/17] cirrus.yml: reduce scope of MacOS build Alex Bennée
2019-10-24 10:22 ` [PATCH v2 08/17] travis.yml: bump Xcode 10 to latest dot release Alex Bennée
2019-10-24 14:32   ` Philippe Mathieu-Daudé
2019-10-24 10:22 ` [PATCH v2 09/17] cirrus.yml: add latest Xcode build target Alex Bennée
2019-10-24 10:22 ` [PATCH v2 10/17] tests/vm: netbsd autoinstall, using serial console Alex Bennée
2019-10-24 10:22 ` [PATCH v2 11/17] tests/vm: Let subclasses disable IPv6 Alex Bennée
2019-10-24 10:22 ` [PATCH v2 12/17] tests/vm/netbsd: Disable IPv6 Alex Bennée
2019-10-24 10:22 ` [PATCH v2 13/17] travis.yml: cache the clang sanitizer build Alex Bennée
2019-10-24 10:22 ` [PATCH v2 14/17] gitlab-ci.yml: Use libvdeplug-dev to compile-test the VDE network backend Alex Bennée
2019-10-24 10:22 ` [PATCH v2 15/17] travis.yml: --enable-debug-tcg to check-tcg Alex Bennée
2019-10-24 14:33   ` Philippe Mathieu-Daudé
2019-10-24 14:34     ` Philippe Mathieu-Daudé
2019-10-24 16:07       ` Alex Bennée
2019-10-24 10:22 ` [PATCH v2 16/17] tests/docker: set HOST_ARCH if we don't have ARCH Alex Bennée
2019-10-24 10:22 ` [PATCH v2 17/17] tests/docker: update Travis image to a more current version Alex Bennée

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=20191024102240.2778-6-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=cota@braap.org \
    --cc=f4bug@amsat.org \
    --cc=fam@euphon.net \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=stefanb@linux.vnet.ibm.com \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    /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).