v2 18/18] check: Only test usb-ehci when it is compiled in

[Qemu-devel] [[PATH for 3.1] v2 18/18] check: Only test usb-ehci when it is compiled in

Posted by Juan Quintela 7 years, 3 months ago

The ehci test also test uhci.  Welcome to the worderfull world of USB.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index f3f8ba48fb..d6f5cc9ccc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -286,8 +286,10 @@ check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
 check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
 gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
+ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
 check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-ehci.c
+endif
+gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c
 gcov-files-i386-y += hw/usb/dev-hid.c
 gcov-files-i386-y += hw/usb/dev-storage.c
 check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [[PATH for 3.1] v2 18/18] check: Only test usb-ehci when it is compiled in

Posted by Thomas Huth 7 years, 3 months ago

On 08/01/2018 01:09 PM, Juan Quintela wrote:
> The ehci test also test uhci.  Welcome to the worderfull world of USB.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index f3f8ba48fb..d6f5cc9ccc 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -286,8 +286,10 @@ check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
>  check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
> +ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
>  check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -gcov-files-i386-y += hw/usb/hcd-ehci.c
> +endif
> +gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c
>  gcov-files-i386-y += hw/usb/dev-hid.c
>  gcov-files-i386-y += hw/usb/dev-storage.c
>  check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>