diff mbox series

[2/2] tests: fix echi/ehci typo

Message ID 20190926111955.17276-3-marcandre.lureau@redhat.com (mailing list archive)
State New, archived
Headers show
Series Fix ehci-test | expand

Commit Message

Marc-André Lureau Sept. 26, 2019, 11:19 a.m. UTC
While at it, simplify using $(land).

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/Makefile.include | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Laurent Vivier Sept. 26, 2019, 11:24 a.m. UTC | #1
On 26/09/2019 13:19, Marc-André Lureau wrote:
> While at it, simplify using $(land).
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/Makefile.include | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 0595914526..3543451ed3 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -endif
> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>  check-qtest-i386-y += tests/q35-test$(EXESUF)
> 

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Thomas Huth Sept. 26, 2019, 11:39 a.m. UTC | #2
On 26/09/2019 13.19, Marc-André Lureau wrote:
> While at it, simplify using $(land).
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Fixes: dad5ddcea3b661c6b8ffd83b9bdf0c56001067a2

> ---
>  tests/Makefile.include | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 0595914526..3543451ed3 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)

D'oh!

> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -endif
> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>  check-qtest-i386-y += tests/q35-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>
Philippe Mathieu-Daudé Sept. 26, 2019, 12:53 p.m. UTC | #3
On 9/26/19 1:39 PM, Thomas Huth wrote:
> On 26/09/2019 13.19, Marc-André Lureau wrote:
>> While at it, simplify using $(land).
>>
>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Fixes: dad5ddcea3b661c6b8ffd83b9bdf0c56001067a2

More than 1 year silently ignored, nice...

> 
>> ---
>>  tests/Makefile.include | 4 +---
>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 0595914526..3543451ed3 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -182,9 +182,7 @@ check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
>>  check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
>>  check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>>  check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>> -ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
> 
> D'oh!

:)

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

>> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>> -endif
>> +check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
>>  check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>>  check-qtest-i386-y += tests/q35-test$(EXESUF)
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
>
diff mbox series

Patch

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 0595914526..3543451ed3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -182,9 +182,7 @@  check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
 check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
 check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
 check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
-ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)
-check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
-endif
+check-qtest-i386-$(call land,$(CONFIG_USB_EHCI),$(CONFIG_USB_UHCI)) += tests/usb-hcd-ehci-test$(EXESUF)
 check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
 check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
 check-qtest-i386-y += tests/q35-test$(EXESUF)