| Message ID | 1454434448-1535-3-git-send-email-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Tue, Feb 02, 2016 at 05:34:04PM +0000, Alex Bennée wrote: > We only ran make check once before it used to be an unreliable target. > It was only a stop gap measure and we should be able to revert it now. > This also stops us needing a large all-MMU build. > > We disable "make check" for a couple of the extra config targets which > are currently broken. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Tested-by: David Gibson <david@gibson.dropbear.id.au> > --- > .travis.yml | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) > > diff --git a/.travis.yml b/.travis.yml > index 4a0c23a..16be23f 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -40,7 +40,7 @@ notifications: > on_failure: always > env: > global: > - - TEST_CMD="" > + - TEST_CMD="make check" > - EXTRA_CONFIG="" > matrix: > # Group major targets together with their linux-user counterparts > @@ -73,17 +73,14 @@ script: > 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,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" > compiler: gcc > + # We currently disable "make check" > - env: TARGETS=i386-softmmu,x86_64-softmmu > EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter" > + TEST_CMD="" > compiler: gcc > # Disable a few of the optional features > - env: TARGETS=i386-softmmu,x86_64-softmmu > @@ -104,11 +101,15 @@ matrix: > - env: TARGETS=i386-softmmu,x86_64-softmmu > EXTRA_CONFIG="--enable-trace-backends=simple" > compiler: gcc > + # We currently disable "make check" > - env: TARGETS=i386-softmmu,x86_64-softmmu > EXTRA_CONFIG="--enable-trace-backends=ftrace" > + TEST_CMD="" > compiler: gcc > + # We currently disable "make check" > - env: TARGETS=i386-softmmu,x86_64-softmmu > - EXTRA_CONFIG="--enable-trace-backends=ust" > + EXTRA_CONFIG="--enable-trace-backends=ust" > + TEST_CMD="" > compiler: gcc > - env: TARGETS=i386-softmmu,x86_64-softmmu > EXTRA_CONFIG="--enable-modules"
diff --git a/.travis.yml b/.travis.yml index 4a0c23a..16be23f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,7 +40,7 @@ notifications: on_failure: always env: global: - - TEST_CMD="" + - TEST_CMD="make check" - EXTRA_CONFIG="" matrix: # Group major targets together with their linux-user counterparts @@ -73,17 +73,14 @@ script: 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,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" compiler: gcc + # We currently disable "make check" - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-debug --enable-tcg-interpreter" + TEST_CMD="" compiler: gcc # Disable a few of the optional features - env: TARGETS=i386-softmmu,x86_64-softmmu @@ -104,11 +101,15 @@ matrix: - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=simple" compiler: gcc + # We currently disable "make check" - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-trace-backends=ftrace" + TEST_CMD="" compiler: gcc + # We currently disable "make check" - env: TARGETS=i386-softmmu,x86_64-softmmu - EXTRA_CONFIG="--enable-trace-backends=ust" + EXTRA_CONFIG="--enable-trace-backends=ust" + TEST_CMD="" compiler: gcc - env: TARGETS=i386-softmmu,x86_64-softmmu EXTRA_CONFIG="--enable-modules"
We only ran make check once before it used to be an unreliable target. It was only a stop gap measure and we should be able to revert it now. This also stops us needing a large all-MMU build. We disable "make check" for a couple of the extra config targets which are currently broken. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .travis.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)