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

["Andreas Färber" <afaerber@suse.de>]

Am 22.02.2012 20:48, schrieb Stefan Weil:
> Adding $(EXESUF) is needed to make those tests work on w32 hosts, too.
> 
> v2:
> Rebased, added new tests, tests sorted alphabetically.
> 
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  tests/Makefile |   38 +++++++++++++++++++++++---------------
>  1 files changed, 23 insertions(+), 15 deletions(-)
> 
> diff --git a/tests/Makefile b/tests/Makefile
> index 74b29dc..09f2b13 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -1,16 +1,24 @@
> -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 = 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-input-visitor$(EXESUF)
> +CHECKS += test-qmp-output-visitor$(EXESUF)
> +CHECKS += test-string-input-visitor$(EXESUF)
> +CHECKS += test-string-output-visitor$(EXESUF)

Cute. (one-per-line allows to easily comment individual ones out)

Some lines below were already way over 80 chars, so

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas

>  
>  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 \
> @@ -28,19 +36,19 @@ $(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
>  
>  .PHONY: check
>  check: $(CHECKS)

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