summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2014-09-24 11:13:56 +0100
committerMichael Tokarev <mjt@tls.msk.ru>2014-09-26 21:05:06 +0400
commited173cb704f01a62143a3ef0dcf8b493bc795c23 (patch)
tree8903852a626ef58b092139667c757f37fcec8f16 /.travis.yml
parentcb021cfee772c916bf73f43010c6c299c3d91800 (diff)
.travis.yml: remove "make check" from main matrix
There are problems with unreliability in "make check" which still need to be tracked down. As the tests are broadly the same for all targets if added one explicit target to the matrix to run it. However this does build all softmmu targets to ensure they at least "run" Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Alexander Graf <agraf@suse.de> Reviewed-by: Brian Jackson <iggy@theiggy.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 15 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index b9025bee42..ad66e5bca3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ notifications:
on_failure: always
env:
global:
- - TEST_CMD="make check"
+ - TEST_CMD=""
- EXTRA_CONFIG=""
# Development packages, EXTRA_PKGS saved for additional builds
- CORE_PKGS="libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev"
@@ -48,10 +48,23 @@ before_install:
before_script:
- ./configure --target-list=${TARGETS} --enable-debug-tcg ${EXTRA_CONFIG}
script:
- - make -j2 && {TEST_CMD}
+ - make -j2 && ${TEST_CMD}
matrix:
# We manually include a number of additional build for non-standard bits
include:
+ # Make check target (we only do this once)
+ - env:
+ - TARGETS=alpha-softmmu,arm-softmmu,aarch64-softmmu,cris-softmmu,
+ i386-softmmu,x86_64-softmmu,m68k-softmmu,microblaze-softmmu,
+ microblazeel-softmmu,mips-softmmu,mips64-softmmu,
+ mips64el-softmmu,mipsel-softmmu,or32-softmmu,ppc-softmmu,
+ ppc64-softmmu,ppcemb-softmmu,s390x-softmmu,sh4-softmmu,
+ sh4eb-softmmu,sparc-softmmu,sparc64-softmmu,
+ unicore32-softmmu,unicore32-linux-user,
+ lm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmmu,
+ xtensaeb-softmmu
+ TEST_CMD="make check"
+ compiler: gcc
# Debug related options
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-debug"
@@ -80,7 +93,6 @@ matrix:
compiler: gcc
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_CONFIG="--enable-trace-backends=ftrace"
- TEST_CMD=""
compiler: gcc
- env: TARGETS=i386-softmmu,x86_64-softmmu
EXTRA_PKGS="liblttng-ust-dev liburcu-dev"