From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:57572) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkKpu-0002O6-Oj for qemu-devel@nongnu.org; Mon, 09 Jan 2012 14:24:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RkKpq-0001yr-77 for qemu-devel@nongnu.org; Mon, 09 Jan 2012 14:24:50 -0500 Received: from cantor2.suse.de ([195.135.220.15]:48960 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RkKpp-0001ym-KC for qemu-devel@nongnu.org; Mon, 09 Jan 2012 14:24:46 -0500 Message-ID: <4F0B3EA2.8010807@suse.de> Date: Mon, 09 Jan 2012 20:23:14 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1326124572-8312-1-git-send-email-aliguori@us.ibm.com> <1326124572-8312-2-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1326124572-8312-2-git-send-email-aliguori@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 02/11] build: split unit test builds to a separate makefile fragment List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Luiz Capitulino Am 09.01.2012 16:56, schrieb Anthony Liguori: > Signed-off-by: Anthony Liguori > --- > Makefile | 31 ++----------------------------- > tests/Makefile | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 33 insertions(+), 29 deletions(-) > create mode 100644 tests/Makefile >=20 > diff --git a/Makefile b/Makefile > index 0cbe7c2..80fb512 100644 > --- a/Makefile > +++ b/Makefile > @@ -162,32 +162,14 @@ fsdev/virtfs-proxy-helper$(EXESUF): LIBS +=3D -lc= ap > qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx > $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GE= N $@") > =20 > -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 q= list.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 $(corouti= ne-obj-y) $(tools-obj-y) > - > $(qapi-obj-y): $(GENERATED_HEADERS) > qapi-dir :=3D $(BUILD_DIR)/qapi-generated > -test-qmp-input-visitor.o test-qmp-output-visitor.o test-qmp-commands.o= qemu-ga$(EXESUF): QEMU_CFLAGS +=3D -I $(qapi-dir) > + > qemu-ga$(EXESUF): LIBS =3D $(LIBS_QGA) > =20 > gen-out-type =3D $(subst .,-,$@) > =20 > -$(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ > -$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py > - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(ge= n-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > -$(qapi-dir)/test-qapi-visit.c $(qapi-dir)/test-qapi-visit.h :\ > -$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py > - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(ge= n-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > -$(qapi-dir)/test-qmp-commands.h $(qapi-dir)/test-qmp-marshal.c :\ > -$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py > - $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.= py $(gen-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > +include $(SRC_PATH)/tests/Makefile > =20 > $(qapi-dir)/qga-qapi-types.c $(qapi-dir)/qga-qapi-types.h :\ > $(SRC_PATH)/qapi-schema-guest.json $(SRC_PATH)/scripts/qapi-types.py > @@ -209,15 +191,6 @@ qmp-commands.h qmp-marshal.c :\ > $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py > $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.py $= (gen-out-type) -m -o "." < $<, " GEN $@") > =20 > -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-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) $(qa= pi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-q= api-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 > - > QGALIB_OBJ=3D$(addprefix $(qapi-dir)/, qga-qapi-types.o qga-qapi-visit= .o qga-qmp-marshal.o) > QGALIB_GEN=3D$(addprefix $(qapi-dir)/, qga-qapi-types.h qga-qapi-visit= .h qga-qmp-commands.h) > $(QGALIB_OBJ): $(QGALIB_GEN) $(GENERATED_HEADERS) > diff --git a/tests/Makefile b/tests/Makefile > new file mode 100644 > index 0000000..c11d980 > --- /dev/null > +++ b/tests/Makefile > @@ -0,0 +1,31 @@ > +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 q= list.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 $(corouti= ne-obj-y) $(tools-obj-y) > + > +test-qmp-input-visitor.o test-qmp-output-visitor.o test-qmp-commands.o= qemu-ga$(EXESUF): QEMU_CFLAGS +=3D -I $(qapi-dir) > + > +$(qapi-dir)/test-qapi-types.c $(qapi-dir)/test-qapi-types.h :\ > +$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-types.py $(ge= n-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > +$(qapi-dir)/test-qapi-visit.c $(qapi-dir)/test-qapi-visit.h :\ > +$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-visit.py $(ge= n-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > +$(qapi-dir)/test-qmp-commands.h $(qapi-dir)/test-qmp-marshal.c :\ > +$(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py > + $(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi-commands.= py $(gen-out-type) -o "$(qapi-dir)" -p "test-" < $<, " GEN $@") > + > +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-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) $(qa= pi-obj-y) $(tools-obj-y) $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-q= api-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 > + Would be nice if we could recurse into tests/ subdir... If you don't want that, please rename the file so that it is obvious. Also, the new Makefile probably needs to be added to $FILES in configure for out-of-tree builds? Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg