Travis CI: split build and test into two steps

diff --git a/.travis.yml b/.travis.yml
index 2fe4507322f496507a4b27ef0b8c2a97eaec874c..c94065f61816f0b5e9a731f4a3ee6e2dbd11bfec 100644 (file)
--- 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 291983745d5503cf699f3a15fc3df82b25355ccd..ed06203dadd1d48205516950c7770dd731f93b8c 100755 (executable)
--- 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"