From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57433) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiXHj-0006tQ-Lr for qemu-devel@nongnu.org; Tue, 22 Mar 2016 21:08:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiXHh-0002B3-LI for qemu-devel@nongnu.org; Tue, 22 Mar 2016 21:08:31 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:43378) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiXHg-0002Ab-VX for qemu-devel@nongnu.org; Tue, 22 Mar 2016 21:08:29 -0400 Date: Wed, 23 Mar 2016 11:42:27 +1100 From: David Gibson Message-ID: <20160323004227.GM23586@voom.redhat.com> References: <1458651195-21176-1-git-send-email-alex.bennee@linaro.org> <1458651195-21176-2-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="rdbbj4JunmnVtKq/" Content-Disposition: inline In-Reply-To: <1458651195-21176-2-git-send-email-alex.bennee@linaro.org> Subject: Re: [Qemu-devel] [PATCH v1 1/3] .travis.yml: collapse the test matrix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex =?iso-8859-1?Q?Benn=E9e?= Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org --rdbbj4JunmnVtKq/ Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Mar 22, 2016 at 12:53:13PM +0000, Alex Benn=E9e wrote: > Remove the concept of TARGETS and build the complete target list for > each config combination. Now the matrix is just based on CONFIG stanzas > and we use the additional stuff for: >=20 > - things that only work on one compiler (sparse, gcov, gprof) > - combos where "make check" fails >=20 > Signed-off-by: Alex Benn=E9e Reviewed-by: David Gibson > --- > .travis.yml | 75 +++++++++++++++----------------------------------------= ------ > 1 file changed, 18 insertions(+), 57 deletions(-) >=20 > diff --git a/.travis.yml b/.travis.yml > index 9e5873b..18c04af 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -42,17 +42,13 @@ notifications: > env: > global: > - TEST_CMD=3D"make check" > - - EXTRA_CONFIG=3D"" > matrix: > - # Group major targets together with their linux-user counterparts > - - TARGETS=3Dalpha-softmmu,alpha-linux-user,cris-softmmu,cris-linux-u= ser,m68k-softmmu,m68k-linux-user,microblaze-softmmu,microblazeel-softmmu,mi= croblaze-linux-user,microblazeel-linux-user > - - TARGETS=3Darm-softmmu,arm-linux-user,armeb-linux-user,aarch64-soft= mmu,aarch64-linux-user > - - TARGETS=3Di386-softmmu,i386-linux-user,x86_64-softmmu,x86_64-linux= -user > - - TARGETS=3Dmips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-soft= mmu,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user= ,mipsn32-linux-user,mipsn32el-linux-user > - - TARGETS=3Dor32-softmmu,or32-linux-user,ppc-softmmu,ppc64-softmmu,p= pcemb-softmmu,ppc-linux-user,ppc64-linux-user,ppc64abi32-linux-user,ppc64le= -linux-user > - - TARGETS=3Ds390x-softmmu,s390x-linux-user,sh4-softmmu,sh4eb-softmmu= ,sh4-linux-user,sh4eb-linux-user,sparc-softmmu,sparc64-softmmu,sparc-linux-= user,sparc32plus-linux-user,sparc64-linux-user,unicore32-softmmu,unicore32-= linux-user > - # Group remaining softmmu only targets into one build > - - TARGETS=3Dlm32-softmmu,moxie-softmmu,tricore-softmmu,xtensa-softmm= u,xtensaeb-softmmu > + - CONFIG=3D"" > + - CONFIG=3D"--enable-debug --enable-debug-tcg --enable-trace-backend= s=3Dlog" > + - CONFIG=3D"--disable-linux-aio --disable-cap-ng --disable-attr --di= sable-brlapi --disable-uuid --disable-libusb" > + - CONFIG=3D"--enable-modules" > + - CONFIG=3D"--with-coroutine=3Ducontext" > + - CONFIG=3D"--with-coroutine=3Dsigaltstack" > git: > # we want to do this ourselves > submodules: false > @@ -60,65 +56,30 @@ before_install: > - wget -O - http://people.linaro.org/~alex.bennee/qemu-submodule-git-s= eed.tar.xz | tar -xvJ > - git submodule update --init --recursive > before_script: > - - ./configure --target-list=3D${TARGETS} --enable-debug-tcg ${EXTRA_CO= NFIG} > + - ./configure ${CONFIG} > script: > - make -j2 && ${TEST_CMD} > matrix: > - # We manually include a number of additional build for non-standard bi= ts > include: > - # Debug related options > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-debug" > + # Sparse is GCC only > + - env: CONFIG=3D"--enable-sparse" > compiler: gcc > - # We currently disable "make check" > - - env: TARGETS=3Dalpha-softmmu > - EXTRA_CONFIG=3D"--enable-debug --enable-tcg-interpreter" > - TEST_CMD=3D"" > - compiler: gcc > - # Disable a few of the optional features > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--disable-linux-aio --disable-cap-ng --disabl= e-attr --disable-brlapi --disable-uuid --disable-libusb" > - compiler: gcc > - # Currently configure doesn't force --disable-pie > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-gprof --enable-gcov --disable-pie" > - compiler: gcc > - # Sparse > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-sparse" > + # gprof/gcov are GCC features > + - env: CONFIG=3D"--enable-gprof --enable-gcov --disable-pie" > compiler: gcc > - # Modules > - - env: TARGETS=3Darm-softmmu,x86_64-softmmu > - EXTRA_CONFIG=3D"--enable-modules" > - compiler: gcc > - # All the trace backends (apart from dtrace) > - - env: TARGETS=3Di386-softmmu > - EXTRA_CONFIG=3D"--enable-trace-backends=3Dlog" > - compiler: gcc > - # We currently disable "make check" (until 41fc57e44ed regression fi= xed) > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-trace-backends=3Dsimple" > + # We manually include builds which we disable "make check" for > + - env: CONFIG=3D"--enable-debug --enable-tcg-interpreter" > TEST_CMD=3D"" > compiler: gcc > - # We currently disable "make check" > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-trace-backends=3Dftrace" > + - env: CONFIG=3D"--enable-trace-backends=3Dsimple" > TEST_CMD=3D"" > compiler: gcc > - # We currently disable "make check" > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--enable-trace-backends=3Dust" > + - env: CONFIG=3D"--enable-trace-backends=3Dftrace" > TEST_CMD=3D"" > compiler: gcc > - # All the co-routine backends (apart from windows) > - # We currently disable "make check" > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--with-coroutine=3Dgthread" > + - env: CONFIG=3D"--enable-trace-backends=3Dust" > TEST_CMD=3D"" > compiler: gcc > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--with-coroutine=3Ducontext" > - compiler: gcc > - - env: TARGETS=3Dx86_64-softmmu > - EXTRA_CONFIG=3D"--with-coroutine=3Dsigaltstack" > + - env: CONFIG=3D"--with-coroutine=3Dgthread" > + TEST_CMD=3D"" > compiler: gcc --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --rdbbj4JunmnVtKq/ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJW8eZzAAoJEGw4ysog2bOSFmUP/1eKOy3kFuvwZ3s0jPPvurEy WLoRt0Thl6zSXzLjmfna0ES18Xdg48ZSE/DCtQyJTSpunxe6yO1qaGIEi7zRYhbb +m9VQoWsQsCFbTLrqkkOwQOt1IE+ZUVemh4gYUHaYZq1VMpG6CCWuup3uBwX5fr7 kXKZ0y1gySmEbj+wxIAZvZXCp+SN5eSd2nGhOVn1Xu7X0bROcLtTsfH/5gIuaGl2 Ep2wbtXe6med0lslDtupTGmrUzg/HHN6rkS6g72bcPFiwufVF7sqIx7YI3hasLV9 0of7js266gD0gEyeoLVi8bsF2uALEyMDo4ee/d2kz4fuiOr4FPZebGvXbls1dzt+ hN1VEkUA7MJEaQfn7aDEIeSsHpOShaG9ugFAlQvEzmc88cDUTXz84zjGGa2dqHTW KRH/FzN4t19ynV/JJMAY20uY4vVsDsbepkU9S/4oTWa3pQ+ExJ3e0m/w8IySgRGG rFouiVxVlOpXrFc0Mbq7v342UmE+UoLnVi7CnEuAiqfMJ6dbrQNJmLigJ9vntBh9 WOM02cDKxr85c8nEuXVr9xPS7cUP6j9dUiDvoaD6Zv1IGnkITh2/BqZ2N/PsS1ih ifzdSvkRjtck0EyixaRrt93vZ3/t3qW8/C4CbI7Srt3GULE3uqW4XVevYidCUUkj TK4WdBC+oG4X9yK2ZQv4 =oDbr -----END PGP SIGNATURE----- --rdbbj4JunmnVtKq/--