[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/17] travis.yml: Fix the ccache lines
From: |
Alex Bennée |
Subject: |
[PATCH v2 05/17] travis.yml: Fix the ccache lines |
Date: |
Thu, 24 Oct 2019 11:22:28 +0100 |
From: Thomas Huth <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
---
.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
- [PATCH for 4.2 v2 00/17] testing/next, Alex Bennée, 2019/10/24
- [PATCH v2 01/17] travis.yml: reduce scope of the --enable-debug build, Alex Bennée, 2019/10/24
- [PATCH v2 03/17] travis.yml: Use libsdl2 instead of libsdl1.2, and install libsdl2-image, Alex Bennée, 2019/10/24
- [PATCH v2 04/17] travis.yml: Use newer version of libgnutls and libpng, Alex Bennée, 2019/10/24
- [PATCH v2 02/17] travis.yml: Add libvdeplug-dev to compile-test net/vde.c, Alex Bennée, 2019/10/24
- [PATCH v2 05/17] travis.yml: Fix the ccache lines,
Alex Bennée <=
- [PATCH v2 08/17] travis.yml: bump Xcode 10 to latest dot release, Alex Bennée, 2019/10/24
- [PATCH v2 09/17] cirrus.yml: add latest Xcode build target, Alex Bennée, 2019/10/24
- [PATCH v2 06/17] travis.yml: Test the release tarball, Alex Bennée, 2019/10/24
- [PATCH v2 07/17] cirrus.yml: reduce scope of MacOS build, Alex Bennée, 2019/10/24
- [PATCH v2 10/17] tests/vm: netbsd autoinstall, using serial console, Alex Bennée, 2019/10/24
- [PATCH v2 14/17] gitlab-ci.yml: Use libvdeplug-dev to compile-test the VDE network backend, Alex Bennée, 2019/10/24
- [PATCH v2 16/17] tests/docker: set HOST_ARCH if we don't have ARCH, Alex Bennée, 2019/10/24
- [PATCH v2 13/17] travis.yml: cache the clang sanitizer build, Alex Bennée, 2019/10/24
- [PATCH v2 15/17] travis.yml: --enable-debug-tcg to check-tcg, Alex Bennée, 2019/10/24