Re: [Qemu-devel] [PATCH] tests/Makefile: Re-enable the endianness-, wdt_ib700- and the vmxnet3-test

[Philippe Mathieu-Daudé]

On 9/19/18 10:58 AM, Thomas Huth wrote:
> Recent clean-ups moved these tests directly to the check-qtest-y variable,
> but this variable gets completely overwritten at the end of the Makefile by:
> 
> check-qtest-y=$(foreach TARGET,$(TARGETS), $(check-qtest-$(TARGET)-y))
> 
> So the endianness-, wdt_ib700- and the vmxnet3-test are currently not run
> anymore. We've got to add them to check-qtest-generic-y instead to get

Oops, good catch.

> them included again (vmxnet3 is added to check-qtest-i386-y instead since
> that test only makes sense on x86).
> 
> While we're at it, also move some other separated check-qtest-generic-y
> lines (with the machine-none-test, qom-test and test-hmp) to the block
> of the other generic test lines.
> 
> Signed-off-by: Thomas Huth <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  tests/Makefile.include | 18 ++++++++----------
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 87c81d1..4669c81 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -184,10 +184,15 @@ check-block-$(CONFIG_POSIX) += 
> tests/qemu-iotests-quick.sh
>  check-qtest-generic-y = tests/qmp-test$(EXESUF)
>  gcov-files-generic-y = monitor.c qapi/qmp-dispatch.c
>  check-qtest-generic-y += tests/qmp-cmd-test$(EXESUF)
> -
>  check-qtest-generic-y += tests/device-introspect-test$(EXESUF)
>  gcov-files-generic-y = qdev-monitor.c qmp.c
>  check-qtest-generic-y += tests/cdrom-test$(EXESUF)
> +check-qtest-generic-y += tests/machine-none-test$(EXESUF)
> +check-qtest-generic-y += tests/qom-test$(EXESUF)
> +check-qtest-generic-y += tests/test-hmp$(EXESUF)
> +check-qtest-generic-$(CONFIG_ISA_TESTDEV) += tests/endianness-test$(EXESUF)
> +check-qtest-generic-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
> +gcov-files-generic-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c 
> hw/watchdog/wdt_ib700.c
>  
>  gcov-files-ipack-y += hw/ipack/ipack.c
>  check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)
> @@ -255,12 +260,9 @@ check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += 
> tests/ivshmem-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
>  check-qtest-pci-y += tests/megasas-test$(EXESUF)
>  gcov-files-pci-y += hw/scsi/megasas.c
> -check-qtest-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
> -gcov-files-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
> -check-qtest-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
> -check-qtest-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
> -gcov-files-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c 
> hw/watchdog/wdt_ib700.c
>  
> +check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
>  check-qtest-i386-y += tests/fdc-test$(EXESUF)
>  gcov-files-i386-y = hw/block/fdc.c
>  check-qtest-i386-y += tests/ide-test$(EXESUF)
> @@ -404,10 +406,6 @@ check-qtest-s390x-y += tests/drive_del-test$(EXESUF)
>  check-qtest-s390x-y += tests/virtio-ccw-test$(EXESUF)
>  check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF)
>  
> -check-qtest-generic-y += tests/machine-none-test$(EXESUF)
> -check-qtest-generic-y += tests/qom-test$(EXESUF)
> -check-qtest-generic-y += tests/test-hmp$(EXESUF)
> -
>  qapi-schema += alternate-any.json
>  qapi-schema += alternate-array.json
>  qapi-schema += alternate-base.json
>