Eric Blake <ebl...@redhat.com> writes: > Ed-script diffs are awful compared to context diffs. Fix another > 'diff -q' while in the area (if the files are different, being > noisy makes it easier to diagnose why). > > Fixes: 46ec4fce > Signed-off-by: Eric Blake <ebl...@redhat.com> > --- > tests/Makefile.include | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index f41da235aef..375f31b5bc0 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -919,14 +919,14 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): > check-%.json: $(SRC_PATH)/%.json > $^ >$*.test.out 2>$*.test.err; \ > echo $$? >$*.test.exit, \ > "TEST","$*.out") > - @diff $(SRC_PATH)/$*.out $*.test.out > + @diff -u $(SRC_PATH)/$*.out $*.test.out > @# Sanitize error messages (make them independent of build directory) > - @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff > $(SRC_PATH)/$*.err - > - @diff $(SRC_PATH)/$*.exit $*.test.exit > + @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff -u > $(SRC_PATH)/$*.err - > + @diff -u $(SRC_PATH)/$*.exit $*.test.exit
Let's diff .err before .out, because when .err differs, .out is usually useless. > > .PHONY: check-tests/qapi-schema/doc-good.texi > check-tests/qapi-schema/doc-good.texi: tests/qapi-schema/doc-good.test.texi > - @diff -q $(SRC_PATH)/tests/qapi-schema/doc-good.texi $< > + @diff -u $(SRC_PATH)/tests/qapi-schema/doc-good.texi $< > > # Consolidated targets
