Re: [Qemu-devel] [PATCH v4] w32: Support tests (make check)

[Anthony Liguori <anthony@codemonkey.ws>]

On 03/27/2012 12:48 AM, Stefan Weil wrote:
> Adding $(EXESUF) is needed to make those tests work on w32 hosts, too.
>
> v2:
> Rebased, added new tests, tests sorted alphabetically.
>
> v3:
> Rebased, $(EXESUF) for qemu-img, qemu-io which were recently added.
>
> v4:
> Rebased, new test test-qmp-commands which was recently added.
>
> Cc: Anthony Liguori<aliguori@us.ibm.com>
> Cc: Kevin Wolf<kwolf@redhat.com>
> Cc: Andreas Färber<afaerber@suse.de>
> Reviewed-by: Andreas Färber<afaerber@suse.de>
> Signed-off-by: Stefan Weil<sw@weilnetz.de>
> ---
>
> This is the 4rd version of my patch. The 1st was sent in February,
> and again some other newer (!) patches were committed,
> so I had to rebase my patch a third time now.

32, W64
L: qemu-devel@nongnu.org
M: Stefan Weil <sw@weilnetz.de>
S: Maintained
F: *win32*

Why don't you send a pull request?  You asked me to include this in the qtest 
series so that's why I did.  qtest still hasn't gotten merged so this patch 
hasn't gotten merged.

Regards,

Anthony Liguori

>
> Anthony, please commit.
>
> Cheers,
> Stefan Weil
>
>   tests/Makefile |   42 +++++++++++++++++++++++++-----------------
>   1 files changed, 25 insertions(+), 17 deletions(-)
>
> diff --git a/tests/Makefile b/tests/Makefile
> index 94ea342..ca03b3a 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -1,20 +1,28 @@
>   export SRC_PATH
>
> -CHECKS = check-qdict check-qfloat check-qint check-qstring check-qlist
> -CHECKS += check-qjson test-qmp-output-visitor test-qmp-input-visitor
> -CHECKS += test-string-input-visitor test-string-output-visitor test-coroutine
> -CHECKS += test-qmp-commands
> +CHECKS = check-qdict$(EXESUF)
> +CHECKS += check-qfloat$(EXESUF)
> +CHECKS += check-qint$(EXESUF)
> +CHECKS += check-qjson$(EXESUF)
> +CHECKS += check-qlist$(EXESUF)
> +CHECKS += check-qstring$(EXESUF)
> +CHECKS += test-coroutine$(EXESUF)
> +CHECKS += test-qmp-commands$(EXESUF)
> +CHECKS += test-qmp-input-visitor$(EXESUF)
> +CHECKS += test-qmp-output-visitor$(EXESUF)
> +CHECKS += test-string-input-visitor$(EXESUF)
> +CHECKS += test-string-output-visitor$(EXESUF)
>   CHECKS += $(SRC_PATH)/tests/qemu-iotests-quick.sh
>
>   check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o check-qjson.o test-coroutine.o: $(GENERATED_HEADERS)
>
> -check-qint: check-qint.o qint.o $(tools-obj-y)
> -check-qstring: check-qstring.o qstring.o $(tools-obj-y)
> -check-qdict: check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(tools-obj-y)
> -check-qlist: check-qlist.o qlist.o qint.o $(tools-obj-y)
> -check-qfloat: check-qfloat.o qfloat.o $(tools-obj-y)
> -check-qjson: check-qjson.o $(qobject-obj-y) $(tools-obj-y)
> -test-coroutine: test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y) $(tools-obj-y)
> +check-qint$(EXESUF): check-qint.o qint.o $(tools-obj-y)
> +check-qstring$(EXESUF): check-qstring.o qstring.o $(tools-obj-y)
> +check-qdict$(EXESUF): check-qdict.o qdict.o qfloat.o qint.o qstring.o qbool.o qlist.o $(tools-obj-y)
> +check-qlist$(EXESUF): check-qlist.o qlist.o qint.o $(tools-obj-y)
> +check-qfloat$(EXESUF): check-qfloat.o qfloat.o $(tools-obj-y)
> +check-qjson$(EXESUF): check-qjson.o $(qobject-obj-y) $(tools-obj-y)
> +test-coroutine$(EXESUF): test-coroutine.o qemu-timer-common.o async.o $(coroutine-obj-y) $(tools-obj-y)
>
>   test-qmp-input-visitor.o test-qmp-output-visitor.o \
>   test-string-input-visitor.o test-string-output-visitor.o \
> @@ -32,21 +40,21 @@ $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py
>
>
>   test-string-output-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
> -test-string-output-visitor: test-string-output-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
> +test-string-output-visitor$(EXESUF): test-string-output-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>
>   test-string-input-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
> -test-string-input-visitor: test-string-input-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
> +test-string-input-visitor$(EXESUF): test-string-input-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>
>   test-qmp-output-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
> -test-qmp-output-visitor: test-qmp-output-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
> +test-qmp-output-visitor$(EXESUF): test-qmp-output-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>
>   test-qmp-input-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
> -test-qmp-input-visitor: test-qmp-input-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
> +test-qmp-input-visitor$(EXESUF): test-qmp-input-visitor.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
>
>   test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y)
> -test-qmp-commands: test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
> +test-qmp-commands$(EXESUF): test-qmp-commands.o $(qobject-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
>
> -$(SRC_PATH)/tests/qemu-iotests-quick.sh: qemu-img qemu-io
> +$(SRC_PATH)/tests/qemu-iotests-quick.sh: qemu-img$(EXESUF) qemu-io$(EXESUF)
>
>
>   .PHONY: check check-block