Message ID | 1442986032-26529-1-git-send-email-david@gibson.dropbear.id.au |
---|---|
State | New |
Headers | show |
23.09.2015 08:27, David Gibson wrote: > ed173cb ".travis.yml: remove "make check" from main matrix" stopped running > make check for all the Travis build targets for various reasons. It > continued to run make check on one Travis build, which builds for a big > list of all (? nearly all) our supported softmmu targets. > > Unfortunately, due to a spacing / quoting error it only actually builds for > the alpha, arm, aarch64 and cris targets. Specifically, the list of > targets is split over several lines. Even with YAML folding, this will > leave spaces in the list, meaning $TARGETS won't have the value we need. > > I had a look at the YAML spec and I couldn't quickly see a way of splitting > the list so that it doesn't end up with spaces, so this patch fixes the > problem by putting the whole list on one huge line. Applied to -trivial, thank you! /mjt
diff --git a/.travis.yml b/.travis.yml index 0ac170b..6ca0260 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,15 +54,7 @@ matrix: 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 + - 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
ed173cb ".travis.yml: remove "make check" from main matrix" stopped running make check for all the Travis build targets for various reasons. It continued to run make check on one Travis build, which builds for a big list of all (? nearly all) our supported softmmu targets. Unfortunately, due to a spacing / quoting error it only actually builds for the alpha, arm, aarch64 and cris targets. Specifically, the list of targets is split over several lines. Even with YAML folding, this will leave spaces in the list, meaning $TARGETS won't have the value we need. I had a look at the YAML spec and I couldn't quickly see a way of splitting the list so that it doesn't end up with spaces, so this patch fixes the problem by putting the whole list on one huge line. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> --- .travis.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)