qapi: Pass '-u' when doing non-silent diff
PATCH v2 1/1 qapi: Pass '-u' when doing non-silent diff
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).
While at it, diff .err before .out, because if a test fails, .err is more likely to contain the most important information for fixing the failure.
Fixes 46ec4fce
Signed-off-by Eric Blake <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
---
v2: diff .err first [Markus], R-b added (since swapping lines is trivial)
Extracted from a larger '0/3 QAPI file renames' series; this patch is reasonable for inclusion during softfreeze, so I'll queue it through my QAPI tree.
--- tests/Makefile.include | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
tests/Makefile.include +4 -4
@@ -926,14 +926,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 @# 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)/$*.out $*.test.out + @diff -u $(SRC_PATH)/$*.exit $*.test.exit .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 $< .PHONY: check-decodetree check-decodetree:
Signature · 1 line
2.14.3