[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] tests/Makefile: Re-enable the endianness-, wdt_
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH] tests/Makefile: Re-enable the endianness-, wdt_ib700- and the vmxnet3-test |
Date: |
Sun, 23 Sep 2018 17:04:10 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 |
On 2018-09-19 10:58, 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
> 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>
> ---
> 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
Never mind, after some more testing, I had to discover that this does
not work as expected - the test is then also run on architectures like
"cris" where it does not work at all...
I think we have to convert this back to check-qtest-<architecture>-y
lines again :-/
Thomas