From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCPHD-0003CW-Ma for qemu-devel@nongnu.org; Tue, 27 Mar 2012 01:49:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCPHB-0000di-BB for qemu-devel@nongnu.org; Tue, 27 Mar 2012 01:49:03 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:54687) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCPHB-0000d5-2G for qemu-devel@nongnu.org; Tue, 27 Mar 2012 01:49:01 -0400 From: Stefan Weil Date: Tue, 27 Mar 2012 07:48:55 +0200 Message-Id: <1332827335-31238-1-git-send-email-sw@weilnetz.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4] w32: Support tests (make check) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Kevin Wolf , Stefan Weil , qemu-devel@nongnu.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= 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 Cc: Kevin Wolf Cc: Andreas F=C3=A4rber Reviewed-by: Andreas F=C3=A4rber Signed-off-by: Stefan Weil --- 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. 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 =20 -CHECKS =3D check-qdict check-qfloat check-qint check-qstring check-qlist -CHECKS +=3D check-qjson test-qmp-output-visitor test-qmp-input-visitor -CHECKS +=3D test-string-input-visitor test-string-output-visitor test-co= routine -CHECKS +=3D test-qmp-commands +CHECKS =3D check-qdict$(EXESUF) +CHECKS +=3D check-qfloat$(EXESUF) +CHECKS +=3D check-qint$(EXESUF) +CHECKS +=3D check-qjson$(EXESUF) +CHECKS +=3D check-qlist$(EXESUF) +CHECKS +=3D check-qstring$(EXESUF) +CHECKS +=3D test-coroutine$(EXESUF) +CHECKS +=3D test-qmp-commands$(EXESUF) +CHECKS +=3D test-qmp-input-visitor$(EXESUF) +CHECKS +=3D test-qmp-output-visitor$(EXESUF) +CHECKS +=3D test-string-input-visitor$(EXESUF) +CHECKS +=3D test-string-output-visitor$(EXESUF) CHECKS +=3D $(SRC_PATH)/tests/qemu-iotests-quick.sh =20 check-qint.o check-qstring.o check-qdict.o check-qlist.o check-qfloat.o = check-qjson.o test-coroutine.o: $(GENERATED_HEADERS) =20 -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 qli= st.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 qb= ool.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) =20 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 =20 =20 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 $(qobj= ect-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(q= api-dir)/test-qapi-types.o =20 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)/te= st-qapi-types.o +test-string-input-visitor$(EXESUF): test-string-input-visitor.o $(qobjec= t-obj-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qap= i-dir)/test-qapi-types.o =20 test-qmp-output-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c t= est-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) $(qa= pi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-q= api-types.o +test-qmp-output-visitor$(EXESUF): test-qmp-output-visitor.o $(qobject-ob= j-y) $(qapi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-di= r)/test-qapi-types.o =20 test-qmp-input-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c te= st-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-qap= i-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 =20 test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qa= pi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qm= p-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 =20 -$(SRC_PATH)/tests/qemu-iotests-quick.sh: qemu-img qemu-io +$(SRC_PATH)/tests/qemu-iotests-quick.sh: qemu-img$(EXESUF) qemu-io$(EXES= UF) =20 =20 .PHONY: check check-block --=20 1.7.9