From bcfd8b348c01fa8ac0ffdac784920b007cb2612e Mon Sep 17 00:00:00 2001 From: Martin Matuska Date: Thu, 15 Dec 2016 01:16:17 +0100 Subject: [PATCH] Travis CI: split build and test into two steps --- .travis.yml | 4 +++- build/ci_build.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2fe450732..c94065f61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,6 @@ install: - if [ `uname` = "Darwin" ]; then brew install xz lzo lz4; fi - if [ `uname` = "Linux" ]; then sudo apt-get install -y libbz2-dev libzip-dev liblzma-dev liblzo2-dev; fi script: - - travis_wait 30 build/ci_build.sh + - build/ci_build.sh + - if [ `uname` = "Linux" ]; then build/ci_build.sh -a test; fi + - if [ `uname` = "Darwin" ]; then travis_wait 30 build/ci_build.sh -a test; fi diff --git a/build/ci_build.sh b/build/ci_build.sh index 291983745..ed06203da 100755 --- a/build/ci_build.sh +++ b/build/ci_build.sh @@ -55,7 +55,7 @@ while getopts a:b:d:s: opt; do esac done if [ -z "${ACTIONS}" ]; then - ACTIONS="autogen configure build test" + ACTIONS="autogen configure build" fi if [ -z "${BUILD_SYSTEM}" ]; then inputerror "Missing type (-t) parameter" -- 2.47.2