| Message ID | 1466169377-29368-1-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Jun 17, 2016 at 03:16:17PM +0200, Thomas Huth wrote: > The recent commit that added the prom-env-test accidentially > overwrote the check-qtest-ppc-y, check-qtest-ppc64-y and > check-qtest-sparc-y variables instead of extending them. > > Fixes: fcbf4a3c0c576eec1321f9cff4fa0dd8e0b1a82f > Signed-off-by: Thomas Huth <thuth@redhat.com> Applied to ppc-for-2.7 > --- > tests/Makefile.include | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index a2ed83b..fd2dba4 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -259,11 +259,11 @@ 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) > +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-sparc64-y += tests/prom-env-test$(EXESUF) > check-qtest-microblazeel-y = $(check-qtest-microblaze-y) > check-qtest-xtensaeb-y = $(check-qtest-xtensa-y) >
diff --git a/tests/Makefile.include b/tests/Makefile.include index a2ed83b..fd2dba4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -259,11 +259,11 @@ 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) +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-sparc64-y += tests/prom-env-test$(EXESUF) check-qtest-microblazeel-y = $(check-qtest-microblaze-y) check-qtest-xtensaeb-y = $(check-qtest-xtensa-y)
The recent commit that added the prom-env-test accidentially overwrote the check-qtest-ppc-y, check-qtest-ppc64-y and check-qtest-sparc-y variables instead of extending them. Fixes: fcbf4a3c0c576eec1321f9cff4fa0dd8e0b1a82f Signed-off-by: Thomas Huth <thuth@redhat.com> --- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)