Eric Blake <ebl...@redhat.com> writes: > On 02/03/2018 03:08 AM, Markus Armbruster wrote: >> Eric Blake <ebl...@redhat.com> writes: >> >>> On 02/02/2018 07:03 AM, Markus Armbruster wrote: >>>> Error messages print absolute filenames of included files even gave a >>> >>> s/even gave/even when given/ >> >> I meant to write "even if the user gave". Is that okay? > > Yes, that works too. > >> >>>> relative one on the command line: >>>> >>>> PYTHONPATH=scripts python -B tests/qapi-schema/test-qapi.py >>>> tests/qapi-schema/include-cycle.json >>>> In file included from tests/qapi-schema/include-cycle.json:1: >>>> In file included from >>>> /work/armbru/qemu/tests/qapi-schema/include-cycle-b.json:1: >>>> /work/armbru/qemu/tests/qapi-schema/include-cycle-c.json:1: Inclusion >>>> loop for include-cycle.json >>>> >>>> Improve this to >>>> >>>> In file included from tests/qapi-schema/include-cycle.json:1: >>>> 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 >>> >>> Nice, and makes developing new qapi tests a little less painful since >>> it's less modification to qapi-schema/*.err additions. >> >> Probably not, as our make rule strips off $(SRC_PATH): >> >> @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -q >> $(SRC_PATH)/$*.err - >> >> I've kept that, because it might also occur in stack backtraces. I >> think. > > I still recall having to hand-edit .err files when doing a naive "run > the test to get the failure, then 'mv' the bad files into the expected > filenames, then rerun the tests";
Whenever the Perl script does something, you can't simply move the .test.err to .err. Annoying. A make target check-accept could automate the work. However, with this patch, the Perl script should do something less often. I guess that's your point. Sorry for being slow on the update :) > so I'm not sure if our make rule was > properly munging absolute names out of the file in the first place. I'm > not too fussed about it, though, as adding new tests is less frequent > and it's still fairly easy to learn if you did it right or not by > whether 'make check' succeeds. > >>>> Signed-off-by: Markus Armbruster <arm...@redhat.com> >>>> --- >>>> scripts/qapi/common.py | 12 ++++++------ >>>> tests/qapi-schema/include-no-file.err | 2 +- >>>> 2 files changed, 7 insertions(+), 7 deletions(-) >>>> >>> >>> Reviewed-by: Eric Blake <ebl...@redhat.com> >> >> Thanks! >>
