From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaR7w-0007Pr-QM for qemu-devel@nongnu.org; Fri, 11 Sep 2015 12:24:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZaR7s-0004ev-S2 for qemu-devel@nongnu.org; Fri, 11 Sep 2015 12:24:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50720) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZaR7s-0004eq-Kc for qemu-devel@nongnu.org; Fri, 11 Sep 2015 12:24:36 -0400 References: <1441973427-8897-1-git-send-email-berrange@redhat.com> <1441973427-8897-3-git-send-email-berrange@redhat.com> From: Eric Blake Message-ID: <55F3003D.1050203@redhat.com> Date: Fri, 11 Sep 2015 10:24:29 -0600 MIME-Version: 1.0 In-Reply-To: <1441973427-8897-3-git-send-email-berrange@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eDdkJSwGhh10vtC4i0KmOrprsMJaVfEPu" Subject: Re: [Qemu-devel] [PATCH PULL 02/11] tests: remove repetition in unit test object deps List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Peter Maydell This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eDdkJSwGhh10vtC4i0KmOrprsMJaVfEPu Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 09/11/2015 06:10 AM, Daniel P. Berrange wrote: > Most of the unit tests have identical sets of object deps. > For example all block unit tests need to depend on >=20 > $(block-obj-y) libqemuutil.a libqemustub.a >=20 > Currently each unit test repeats this list of test deps. > This list of deps will grow as future patches add more > modules to the build, so define some common variables > that can be used by all unit tests to remove the > repetition. >=20 > Signed-off-by: Daniel P. Berrange > --- > tests/Makefile | 94 ++++++++++++++++++++++++++++++--------------------= -------- > 1 file changed, 49 insertions(+), 45 deletions(-) >=20 > +++ b/tests/Makefile > @@ -276,47 +276,51 @@ test-obj-y =3D tests/check-qint.o tests/check-qst= ring.o tests/check-qdict.o \ > tests/test-opts-visitor.o tests/test-qmp-event.o \ > tests/rcutorture.o tests/test-rcu-list.o As it is, I found that we have a bug where we rely on undefined $(qapi-py). So you may want to squash this in (otherwise, I have it as a patch on my local tree that I still need to publish): +++ b/tests/Makefile @@ -1,5 +1,7 @@ export SRC_PATH +qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.= py + # Get the list of all supported sysemu targets SYSEMU_TARGET_LIST :=3D $(subst -softmmu.mak,,$(notdir \ $(wildcard $(SRC_PATH)/default-configs/*-softmmu.mak))) > + > +# Deps that are common to various different sets of tests below > +test-util-obj-y =3D libqemuutil.a libqemustub.a > +test-qom-obj-y =3D qom/object.o qom/qom-qobject.o \ > + qom/container.o qom/object_interfaces.o \ > + $(test-util-obj-y) > +test-qapi-obj-y =3D tests/test-qapi-visit.o tests/test-qapi-types.o \ > + tests/test-qapi-event.o \ > + $(test-qom-obj-y) as well as add $(qapi-py) to the prereqs of test-qapi-obj-y. but overall looks sane. --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --eDdkJSwGhh10vtC4i0KmOrprsMJaVfEPu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJV8wA9AAoJEKeha0olJ0Nqau0H+gIp0xZKcCJ/MxsP3qhx6oml 8x/xqThmXx54/8UpWGSZsxXTEulEzHKcKAyhcNU+LQBLQr2S1MrgA8CLYhqHPP6A S9OLsHjJgLJwXvgtAdUA1I8xjUo/A/36kyOqpOGq8AIfHCjIyGo3oeoxHjgHFiBq 5Kgke2O08kVB5As5XpZDuggdBIvRCu+Yhh7ykrJ+4M1qlJUyp7IW+DgqpcrK5hUB uiPVe0VvzDL1hvT0oL5KVSjnKN9zzUOvmjHK09W2L9J8NpCeR77KIU/EdAIgNZyE Hca147a2PJkits69g+WS7NgRtZ1osN6kj/3dBfSlnquaEe8IM8/Mg44v2SYTTwg= =Ig6f -----END PGP SIGNATURE----- --eDdkJSwGhh10vtC4i0KmOrprsMJaVfEPu--