From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNtf3-0003VP-Lt for qemu-devel@nongnu.org; Thu, 14 Jul 2016 23:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNtex-0002aZ-Lx for qemu-devel@nongnu.org; Thu, 14 Jul 2016 23:19:30 -0400 Received: from ozlabs.org ([103.22.144.67]:53453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNtew-0002Xg-Ft for qemu-devel@nongnu.org; Thu, 14 Jul 2016 23:19:27 -0400 Date: Fri, 15 Jul 2016 13:12:23 +1000 From: David Gibson Message-ID: <20160715031223.GU14615@voom.fritz.box> References: <1468490266-3468-1-git-send-email-thuth@redhat.com> <1468490266-3468-2-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="HtRZva1Vzv8iP5ye" Content-Disposition: inline In-Reply-To: <1468490266-3468-2-git-send-email-thuth@redhat.com> Subject: Re: [Qemu-devel] [PATCH 1/2] tests: Resort check-qtest entries in Makefile.include List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: qemu-devel@nongnu.org, Eric Blake , Markus Armbruster , Paolo Bonzini , Peter Maydell , Richard Henderson , Peter Crosthwaite , Eduardo Habkost --HtRZva1Vzv8iP5ye Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 14, 2016 at 11:57:45AM +0200, Thomas Huth wrote: > The rather random list of check-qtest-xxx entries caused some > confusion in the past, where to use "=3D" and where to use "+=3D" > (see commits 0ccac16f59462b8e2b9afbc1 and 1f5c1cfbaec0792cd2e5da > for example). > Sorting the check-qtest-xxx entries by architecure instead and > using some empty lines inbetween should help to ease this > situation a little bit, so that it is hopefully now obvious > that new tests should be added with "+=3D" instead of "=3D". >=20 > Signed-off-by: Thomas Huth > --- > tests/Makefile.include | 32 ++++++++++++++++++++------------ > 1 file changed, 20 insertions(+), 12 deletions(-) >=20 > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 2010b11..b7784d3 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -240,32 +240,40 @@ check-qtest-i386-y +=3D tests/postcopy-test$(EXESUF) > check-qtest-x86_64-y +=3D $(check-qtest-i386-y) > gcov-files-i386-y +=3D i386-softmmu/hw/timer/mc146818rtc.c > gcov-files-x86_64-y =3D $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-fil= es-i386-y)) > + Hm, seems to me like there's still potential for confusion in the mixing of check-qtest lines and gcov-files lines. > check-qtest-mips-y =3D tests/endianness-test$(EXESUF) > check-qtest-mips64-y =3D tests/endianness-test$(EXESUF) > check-qtest-mips64el-y =3D tests/endianness-test$(EXESUF) > + > check-qtest-ppc-y =3D tests/endianness-test$(EXESUF) > +check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) > +check-qtest-ppc-y +=3D tests/prom-env-test$(EXESUF) > + > check-qtest-ppc64-y =3D tests/endianness-test$(EXESUF) > +check-qtest-ppc64-y +=3D tests/boot-order-test$(EXESUF) > +check-qtest-ppc64-y +=3D tests/spapr-phb-test$(EXESUF) > +gcov-files-ppc64-y +=3D ppc64-softmmu/hw/ppc/spapr_pci.c For example, AFAICT this is the first line setting gcov-files-ppc64-y, so shouldn't it be '=3D' instead of '+=3D'? > +check-qtest-ppc64-y +=3D tests/prom-env-test$(EXESUF) > + > check-qtest-sh4-y =3D tests/endianness-test$(EXESUF) > check-qtest-sh4eb-y =3D tests/endianness-test$(EXESUF) Should be another blank line between sh4 and sh4eb, no? > + > +check-qtest-sparc-y =3D tests/prom-env-test$(EXESUF) > +#check-qtest-sparc-y +=3D tests/m48t59-test$(EXESUF) > +#gcov-files-sparc-y =3D hw/timer/m48t59.c You've added a comment here, haven't you? Which changes something real, not just order. > + > check-qtest-sparc64-y =3D tests/endianness-test$(EXESUF) > -#check-qtest-sparc-y =3D tests/m48t59-test$(EXESUF) > #check-qtest-sparc64-y +=3D tests/m48t59-test$(EXESUF) > -gcov-files-sparc-y +=3D hw/timer/m48t59.c > -gcov-files-sparc64-y +=3D hw/timer/m48t59.c > +#gcov-files-sparc64-y +=3D hw/timer/m48t59.c And here? > +#Disabled for now, triggers a TCG bug on 32-bit hosts > +#check-qtest-sparc64-y +=3D tests/prom-env-test$(EXESUF) > + > check-qtest-arm-y =3D tests/tmp105-test$(EXESUF) > check-qtest-arm-y +=3D tests/ds1338-test$(EXESUF) > gcov-files-arm-y +=3D hw/misc/tmp105.c > check-qtest-arm-y +=3D tests/virtio-blk-test$(EXESUF) > gcov-files-arm-y +=3D arm-softmmu/hw/block/virtio-blk.c > -check-qtest-ppc-y +=3D tests/boot-order-test$(EXESUF) > -check-qtest-ppc64-y +=3D tests/boot-order-test$(EXESUF) > -check-qtest-ppc64-y +=3D tests/spapr-phb-test$(EXESUF) > -gcov-files-ppc64-y +=3D ppc64-softmmu/hw/ppc/spapr_pci.c > -check-qtest-ppc-y +=3D tests/prom-env-test$(EXESUF) > -check-qtest-ppc64-y +=3D tests/prom-env-test$(EXESUF) > -check-qtest-sparc-y +=3D tests/prom-env-test$(EXESUF) > -#Disabled for now, triggers a TCG bug on 32-bit hosts > -#check-qtest-sparc64-y +=3D tests/prom-env-test$(EXESUF) > + > check-qtest-microblazeel-y =3D $(check-qtest-microblaze-y) > check-qtest-xtensaeb-y =3D $(check-qtest-xtensa-y) And there should be a blank betweem microblazeel and xtensaeb too, no? --=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 --HtRZva1Vzv8iP5ye Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXiFSXAAoJEGw4ysog2bOSbo4QANsPtK0HXQlugrjagTZIeo+O qXEA0+eXrvcba9sS1gK3vFBkXtBSYKblKSqqE9Wq8Hfj7QIMpnqkYSnOsLVluJS9 iuhe1qsqsIQ+uNJbMqD7qlK2zNFmwj2C9IKqmpG4echms09as3WK5P8JwWXS0oXQ 9tTvjm0v8nJOnWi1CnBq+eilp3paZ59ZSiv5FhZEOrGXsS56v+OCycNZdn526SEW S4n6NA1F8NV9+RzayFvyI+4a71sIZwK4NzKf0vGSHsC57ViwFERmo5NF3vETt1cR BYuFT6MJYeTTp6f0kBhSejowr3rhTqFUyqyQ7mKyoDJDuTeVwA4JPJXNv/97qQxc EgLLsS+NnF8QTUqFZJ6yIoQmRoDlSc5aBFGUZnWElscrEN0Wwtb6/By7GbhhV0mS 5sUBvhw4kJVzVn6YufCKllp9N3LL8WTvKGCh9ALRJOORGuHnwtBdFJwsBuWwxAw9 CI9k+pJeBIVWCJAXyNlHNRldbka8tMphrg5mSlqW35t/Tahx+facjjxpdgERUWn8 YrfgGrqSK18MqrJzaehbLmkGwW5jzy4briCDbbmvNM2maJ+o3nR8/cqoX2V6gKxd TaJ/RON6I5bf3a57uPDCHPTQ+NGiR0bm5NnrjP7lpMTZwQKnjrsLr0wXvc7+j6Fb G4rU1624t6sUAX1x77FU =0jFv -----END PGP SIGNATURE----- --HtRZva1Vzv8iP5ye--