From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3YEj-0003m2-Nz for qemu-devel@nongnu.org; Fri, 12 Jun 2015 19:19:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z3YEg-0007ks-IO for qemu-devel@nongnu.org; Fri, 12 Jun 2015 19:19:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z3YEg-0007ko-Cn for qemu-devel@nongnu.org; Fri, 12 Jun 2015 19:19:42 -0400 Message-ID: <557B690C.9020009@redhat.com> Date: Fri, 12 Jun 2015 17:19:40 -0600 From: Eric Blake MIME-Version: 1.0 References: <1434120674-8122-1-git-send-email-armbru@redhat.com> <1434120674-8122-7-git-send-email-armbru@redhat.com> In-Reply-To: <1434120674-8122-7-git-send-email-armbru@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="eQn7Do7FOJKgJjJ0FTfB7ano6dX0nEdPf" Subject: Re: [Qemu-devel] [PATCH 06/16] qapi: Fix file name in error messages for included files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster , qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --eQn7Do7FOJKgJjJ0FTfB7ano6dX0nEdPf Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 06/12/2015 08:51 AM, Markus Armbruster wrote: > We print the name as it appears in the include expression. Tools > processing error messages want it relative to the working directory. > Make it so. >=20 > Signed-off-by: Markus Armbruster > --- > scripts/qapi.py | 7 +++---- > tests/qapi-schema/include-cycle.err | 4 ++-- > tests/qapi-schema/include-nested-err.err | 2 +- > 3 files changed, 6 insertions(+), 7 deletions(-) >=20 > +++ b/tests/qapi-schema/include-cycle.err > @@ -1,3 +1,3 @@ > In file included from tests/qapi-schema/include-cycle.json:1: > -In file included from include-cycle-b.json:1: > -include-cycle-c.json:1: Inclusion loop for include-cycle.json > +In file included from tests/qapi-schema/include-cycle-b.json:1: > +tests/qapi-schema/include-cycle-c.json:1: Inclusion loop for include-c= ycle.json > diff --git a/tests/qapi-schema/include-nested-err.err b/tests/qapi-sche= ma/include-nested-err.err > index 1dacbda..1b7b227 100644 > --- a/tests/qapi-schema/include-nested-err.err > +++ b/tests/qapi-schema/include-nested-err.err > @@ -1,2 +1,2 @@ > In file included from tests/qapi-schema/include-nested-err.json:1: > -missing-colon.json:1:10: Expected ":" > +tests/qapi-schema/missing-colon.json:1:10: Expected ":" Yes, that's nicer to read. Interesting that deleting a parameter makes life better! Reviewed-by: Eric Blake --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --eQn7Do7FOJKgJjJ0FTfB7ano6dX0nEdPf 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/ iQEcBAEBCAAGBQJVe2kMAAoJEKeha0olJ0NqjkYH/2lkIAdfEHUMy30KIxtcOswm xOFCh1hXEnxuXIa7rzBZmlbyqNKg/H43SQXF151gmuYB5AUfw0PA1G87N5btXV5/ gbUNX+0boKnKmmbjnJON+7nFKU1LE08Y5b/pZuzL88O2yYFufBtgjELG4vxOKo4u be5s9Sm8KzlwCnEwctWMiwjdwcW05brgOVcWNjxVm3o78iqM3i9NftFbm/hYUZML 6PU7MaPTQvQLBTSNX/KmSKacFVrVIcEdYh0qo+4SQgflLJMzfTQ/USQn8HkxaECK l241gJWnIbnA0f5r0zBcyn5aLExC4G+cZjFSb5C3TKARDZae9gnoHGrRy31xiG0= =qzt9 -----END PGP SIGNATURE----- --eQn7Do7FOJKgJjJ0FTfB7ano6dX0nEdPf--