Re: [Qemu-devel] [PATCH 1/3] qapi: Pass '-u' when doing non-silent diff

[Eric Blake]

On 02/11/2018 06:04 AM, Markus Armbruster wrote:

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.

Sure, will improve on v2.

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org