Re: [Qemu-devel] [PATCH] tests/Makefile: Run qom-test for every architecture

[Andreas Färber]

Peter,

Am 23.01.2014 17:22, schrieb Peter Maydell:
> Rather than requiring every new architecture to remember to add a line
> to the Makefile to say that qom-test will work on it, autogenerate
> the list of supported architectures by looking at the files in
> default-configs (as configure does), and add qom-test to the
> test list for all of them automatically.
> 
> Signed-off-by: Peter Maydell <address@hidden>
> ---
> Together with Markus' patch for running the test for all known
> machines for the architecture, this will avoid the problem of
> coverage being missed because of forgetting to update a whitelist.
> 
>  tests/Makefile | 31 ++++++++-----------------------
>  1 file changed, 8 insertions(+), 23 deletions(-)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index fd36eee..42a52ff 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -1,5 +1,9 @@
>  export SRC_PATH
>  
> +# Get the list of all supported sysemu targets
> +SYSEMU_TARGET_LIST := $(subst -softmmu.mak,,$(notdir \
> +   $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak)))
> +
>  check-unit-y = tests/check-qdict$(EXESUF)
>  gcov-files-check-qdict-y = qobject/qdict.c
>  check-unit-y += tests/check-qfloat$(EXESUF)
> @@ -71,7 +75,6 @@ check-qtest-i386-y += tests/acpi-test$(EXESUF)
>  check-qtest-i386-y += tests/rtc-test$(EXESUF)
>  check-qtest-i386-y += tests/i440fx-test$(EXESUF)
>  check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
> -check-qtest-i386-y += tests/qom-test$(EXESUF)
>  check-qtest-i386-y += tests/blockdev-test$(EXESUF)
>  check-qtest-i386-y += tests/qdev-monitor-test$(EXESUF)
>  check-qtest-x86_64-y = $(check-qtest-i386-y)

qom-test gets executed twice for x86_64 now.

Without having debugged this further yet, my guess is this last line is
causing qom-test to get added twice to check-qtest-x86_64-y, once
inherited from check-qtest-i386-y and then newly added like for any
other target. Could you please take a look how to fix?

Thanks,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg