diff mbox

[v2,4/4] .travis.yml: remove "make check" from main matrix

Message ID 1411553636-24717-5-git-send-email-alex.bennee@linaro.org
State Superseded
Headers show

Commit Message

Alex Bennée Sept. 24, 2014, 10:13 a.m. UTC 
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>

Comments

Brian Jackson Sept. 24, 2014, 3:13 p.m. UTC | #1 
On Wednesday, September 24, 2014 11:13:56 AM Alex Bennée wrote:
> 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>

> 
> diff --git a/.travis.yml b/.travis.yml
> index b9025be..ad66e5b 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"
diff mbox

Patch

diff --git a/.travis.yml b/.travis.yml
index b9025be..ad66e5b 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"