| Message ID | 1469719089-28189-1-git-send-email-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Thu, Jul 28, 2016 at 05:18:09PM +0200, Laurent Vivier wrote: > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > --- > tests/Makefile.include | 2 ++ > tests/drive_del-test.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) Applied to ppc-for-2.7, thanks. > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 4b5123b..ebecfa4 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -259,6 +259,8 @@ 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-ppc-y += tests/drive_del-test$(EXESUF) > +check-qtest-ppc64-y += tests/drive_del-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) > diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c > index 74e43c2..121b9c9 100644 > --- a/tests/drive_del-test.c > +++ b/tests/drive_del-test.c > @@ -115,7 +115,8 @@ int main(int argc, char **argv) > qtest_add_func("/drive_del/without-dev", test_drive_without_dev); > > /* TODO I guess any arch with PCI would do */ > - if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) { > + if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64") || > + !strcmp(arch, "ppc") || !strcmp(arch, "ppc64")) { > qtest_add_func("/drive_del/after_failed_device_add", > test_after_failed_device_add); > qtest_add_func("/blockdev/drive_del_device_del",
diff --git a/tests/Makefile.include b/tests/Makefile.include index 4b5123b..ebecfa4 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -259,6 +259,8 @@ 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-ppc-y += tests/drive_del-test$(EXESUF) +check-qtest-ppc64-y += tests/drive_del-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) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 74e43c2..121b9c9 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -115,7 +115,8 @@ int main(int argc, char **argv) qtest_add_func("/drive_del/without-dev", test_drive_without_dev); /* TODO I guess any arch with PCI would do */ - if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64")) { + if (!strcmp(arch, "i386") || !strcmp(arch, "x86_64") || + !strcmp(arch, "ppc") || !strcmp(arch, "ppc64")) { qtest_add_func("/drive_del/after_failed_device_add", test_after_failed_device_add); qtest_add_func("/blockdev/drive_del_device_del",
Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- tests/Makefile.include | 2 ++ tests/drive_del-test.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)