1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH for-4.0] tests/Makefile: Use some more CONFIG switches for ppc tests

Thomas Huth posted 1 patch 5 years, 4 months ago
Test asan passed
Test checkpatch passed
Test docker-quick@centos7 passed
Test docker-mingw@fedora passed
Test docker-clang@ubuntu passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1543488180-13687-1-git-send-email-thuth@redhat.com
tests/Makefile.include | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
[Qemu-devel] [PATCH for-4.0] tests/Makefile: Use some more CONFIG switches for ppc tests
Posted by Thomas Huth 5 years, 4 months ago 
To be able to build and test QEMU binaries where certain devices or machines
are disabled, we have to use the right CONFIG_* switches to run certain tests
only if the corresponding device or machine really has been compiled into
the binary.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/Makefile.include | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index d87b403..9b26116 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -242,22 +242,22 @@ check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
 check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
 check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
 check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
-check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
+check-qtest-ppc-$(CONFIG_M48T59) += tests/m48t59-test$(EXESUF)
 
 check-qtest-ppc64-y += $(check-qtest-ppc-y)
-check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
-check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_PSERIES) += tests/spapr-phb-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF)
 check-qtest-ppc64-y += tests/migration-test$(EXESUF)
-check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
-check-qtest-ppc64-y += $(check-qtest-virtio-y)
+check-qtest-ppc64-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
 check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
-check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
 check-qtest-ppc64-y += tests/numa-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
 check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
-- 
1.8.3.1
Re: [Qemu-devel] [PATCH for-4.0] tests/Makefile: Use some more CONFIG switches for ppc tests
Posted by Paolo Bonzini 5 years, 4 months ago 
On 29/11/18 11:43, Thomas Huth wrote:
> To be able to build and test QEMU binaries where certain devices or machines
> are disabled, we have to use the right CONFIG_* switches to run certain tests
> only if the corresponding device or machine really has been compiled into
> the binary.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/Makefile.include | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index d87b403..9b26116 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -242,22 +242,22 @@ check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
>  check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
>  check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
>  check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
> -check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
> +check-qtest-ppc-$(CONFIG_M48T59) += tests/m48t59-test$(EXESUF)
>  
>  check-qtest-ppc64-y += $(check-qtest-ppc-y)
> -check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
> -check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_PSERIES) += tests/spapr-phb-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF)
>  check-qtest-ppc64-y += tests/migration-test$(EXESUF)
> -check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> -check-qtest-ppc64-y += $(check-qtest-virtio-y)
> +check-qtest-ppc64-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
> -check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
>  check-qtest-ppc64-y += tests/numa-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
>  check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
> 

Same here for CONFIG_VIRTIO and spapr-phb-test.

Thanks,

Paolo
Re: [Qemu-devel] [PATCH for-4.0] tests/Makefile: Use some more CONFIG switches for ppc tests
Posted by Wainer dos Santos Moschetta 5 years, 4 months ago 
On 11/29/2018 08:43 AM, Thomas Huth wrote:
> To be able to build and test QEMU binaries where certain devices or machines
> are disabled, we have to use the right CONFIG_* switches to run certain tests
> only if the corresponding device or machine really has been compiled into
> the binary.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/Makefile.include | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index d87b403..9b26116 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

> @@ -242,22 +242,22 @@ check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
>   check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
>   check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
>   check-qtest-ppc-y += tests/boot-serial-test$(EXESUF)
> -check-qtest-ppc-y += tests/m48t59-test$(EXESUF)
> +check-qtest-ppc-$(CONFIG_M48T59) += tests/m48t59-test$(EXESUF)
>   
>   check-qtest-ppc64-y += $(check-qtest-ppc-y)
> -check-qtest-ppc64-y += tests/spapr-phb-test$(EXESUF)
> -check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_PSERIES) += tests/spapr-phb-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF)
>   check-qtest-ppc64-y += tests/migration-test$(EXESUF)
> -check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> -check-qtest-ppc64-y += $(check-qtest-virtio-y)
> +check-qtest-ppc64-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)
>   check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
> -check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
>   check-qtest-ppc64-y += tests/numa-test$(EXESUF)
>   check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
>   check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.