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. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > 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(-) >
> +++ 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-cycle.json > diff --git a/tests/qapi-schema/include-nested-err.err > b/tests/qapi-schema/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 <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
