| Message ID | 1468597179-8337-2-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jul 15, 2016 at 05:39:38PM +0200, Thomas Huth wrote: > The rather random list of check-qtest-xxx entries caused some > confusion in the past, where to use "=" and where to use "+=" > (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 "+=" instead of "=". > While we are at it, this patch also comments out two of the > "gcov-files-..." lines since the corresponding m48t59-test is > disabled for sparc and sparc64, too. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > tests/Makefile.include | 38 +++++++++++++++++++++++++------------- > 1 file changed, 25 insertions(+), 13 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 2010b11..3d76cf4 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -240,33 +240,45 @@ check-qtest-i386-y += tests/postcopy-test$(EXESUF) > check-qtest-x86_64-y += $(check-qtest-i386-y) > gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c > gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) > + > check-qtest-mips-y = tests/endianness-test$(EXESUF) > + > check-qtest-mips64-y = tests/endianness-test$(EXESUF) > + > check-qtest-mips64el-y = tests/endianness-test$(EXESUF) > + > check-qtest-ppc-y = tests/endianness-test$(EXESUF) > -check-qtest-ppc64-y = tests/endianness-test$(EXESUF) > +check-qtest-ppc-y += tests/boot-order-test$(EXESUF) > +check-qtest-ppc-y += tests/prom-env-test$(EXESUF) > + > +check-qtest-ppc64-y = tests/spapr-phb-test$(EXESUF) > +gcov-files-ppc64-y = ppc64-softmmu/hw/ppc/spapr_pci.c > +check-qtest-ppc64-y += tests/endianness-test$(EXESUF) > +check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) > +check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) > + > check-qtest-sh4-y = tests/endianness-test$(EXESUF) > + > check-qtest-sh4eb-y = tests/endianness-test$(EXESUF) > + > +check-qtest-sparc-y = tests/prom-env-test$(EXESUF) > +#check-qtest-sparc-y += tests/m48t59-test$(EXESUF) > +#gcov-files-sparc-y = hw/timer/m48t59.c > + > check-qtest-sparc64-y = tests/endianness-test$(EXESUF) > -#check-qtest-sparc-y = tests/m48t59-test$(EXESUF) > #check-qtest-sparc64-y += tests/m48t59-test$(EXESUF) > -gcov-files-sparc-y += hw/timer/m48t59.c > -gcov-files-sparc64-y += hw/timer/m48t59.c > +#gcov-files-sparc64-y += hw/timer/m48t59.c > +#Disabled for now, triggers a TCG bug on 32-bit hosts > +#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) > + > check-qtest-arm-y = tests/tmp105-test$(EXESUF) > check-qtest-arm-y += tests/ds1338-test$(EXESUF) > gcov-files-arm-y += hw/misc/tmp105.c > check-qtest-arm-y += tests/virtio-blk-test$(EXESUF) > gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c > -check-qtest-ppc-y += tests/boot-order-test$(EXESUF) > -check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) > -check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF) > -gcov-files-ppc64-y += ppc64-softmmu/hw/ppc/spapr_pci.c > -check-qtest-ppc-y += tests/prom-env-test$(EXESUF) > -check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) > -check-qtest-sparc-y += tests/prom-env-test$(EXESUF) > -#Disabled for now, triggers a TCG bug on 32-bit hosts > -#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) > + > check-qtest-microblazeel-y = $(check-qtest-microblaze-y) > + > check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) > > check-qtest-generic-y += tests/qom-test$(EXESUF)
diff --git a/tests/Makefile.include b/tests/Makefile.include index 2010b11..3d76cf4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -240,33 +240,45 @@ check-qtest-i386-y += tests/postcopy-test$(EXESUF) check-qtest-x86_64-y += $(check-qtest-i386-y) gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y)) + check-qtest-mips-y = tests/endianness-test$(EXESUF) + check-qtest-mips64-y = tests/endianness-test$(EXESUF) + check-qtest-mips64el-y = tests/endianness-test$(EXESUF) + check-qtest-ppc-y = tests/endianness-test$(EXESUF) -check-qtest-ppc64-y = tests/endianness-test$(EXESUF) +check-qtest-ppc-y += tests/boot-order-test$(EXESUF) +check-qtest-ppc-y += tests/prom-env-test$(EXESUF) + +check-qtest-ppc64-y = tests/spapr-phb-test$(EXESUF) +gcov-files-ppc64-y = ppc64-softmmu/hw/ppc/spapr_pci.c +check-qtest-ppc64-y += tests/endianness-test$(EXESUF) +check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) +check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) + check-qtest-sh4-y = tests/endianness-test$(EXESUF) + check-qtest-sh4eb-y = tests/endianness-test$(EXESUF) + +check-qtest-sparc-y = tests/prom-env-test$(EXESUF) +#check-qtest-sparc-y += tests/m48t59-test$(EXESUF) +#gcov-files-sparc-y = hw/timer/m48t59.c + check-qtest-sparc64-y = tests/endianness-test$(EXESUF) -#check-qtest-sparc-y = tests/m48t59-test$(EXESUF) #check-qtest-sparc64-y += tests/m48t59-test$(EXESUF) -gcov-files-sparc-y += hw/timer/m48t59.c -gcov-files-sparc64-y += hw/timer/m48t59.c +#gcov-files-sparc64-y += hw/timer/m48t59.c +#Disabled for now, triggers a TCG bug on 32-bit hosts +#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) + check-qtest-arm-y = tests/tmp105-test$(EXESUF) check-qtest-arm-y += tests/ds1338-test$(EXESUF) gcov-files-arm-y += hw/misc/tmp105.c check-qtest-arm-y += tests/virtio-blk-test$(EXESUF) gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c -check-qtest-ppc-y += tests/boot-order-test$(EXESUF) -check-qtest-ppc64-y += tests/boot-order-test$(EXESUF) -check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF) -gcov-files-ppc64-y += ppc64-softmmu/hw/ppc/spapr_pci.c -check-qtest-ppc-y += tests/prom-env-test$(EXESUF) -check-qtest-ppc64-y += tests/prom-env-test$(EXESUF) -check-qtest-sparc-y += tests/prom-env-test$(EXESUF) -#Disabled for now, triggers a TCG bug on 32-bit hosts -#check-qtest-sparc64-y += tests/prom-env-test$(EXESUF) + check-qtest-microblazeel-y = $(check-qtest-microblaze-y) + check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) check-qtest-generic-y += tests/qom-test$(EXESUF)
The rather random list of check-qtest-xxx entries caused some confusion in the past, where to use "=" and where to use "+=" (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 "+=" instead of "=". While we are at it, this patch also comments out two of the "gcov-files-..." lines since the corresponding m48t59-test is disabled for sparc and sparc64, too. Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/Makefile.include | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-)