aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2018-03-15 07:51:16 -0500
committerEric Blake <eblake@redhat.com>2018-03-19 14:58:38 -0500
commit02e3092db3f9b84ed6aae54e3b71d4dc4196c7eb (patch)
treecb660c6e52be08eebbf90e28d4756d3674335106 /tests
parent7e5c776d15b1fc0cda00c255ba035bdf81dbaa31 (diff)
downloadqemu-02e3092db3f9b84ed6aae54e3b71d4dc4196c7eb.zip
qemu-02e3092db3f9b84ed6aae54e3b71d4dc4196c7eb.tar.gz
qemu-02e3092db3f9b84ed6aae54e3b71d4dc4196c7eb.tar.bz2
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 <eblake@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20180315125116.804342-1-eblake@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.include8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 42fd426..412aed1 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -929,14 +929,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: