All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com
Subject: [Qemu-devel] [PATCH 1/3] qapi: Pass '-u' when doing non-silent diff
Date: Sat, 10 Feb 2018 18:40:11 -0600	[thread overview]
Message-ID: <20180211004013.10784-2-eblake@redhat.com> (raw)
In-Reply-To: <20180211004013.10784-1-eblake@redhat.com>

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 <eblake@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

 .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

-- 
2.14.3

  reply	other threads:[~2018-02-11  0:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-11  0:40 [Qemu-devel] [PATCH 0/3] QAPI file renames Eric Blake
2018-02-11  0:40 ` Eric Blake [this message]
2018-02-11  4:11   ` [Qemu-devel] [PATCH 1/3] qapi: Pass '-u' when doing non-silent diff Philippe Mathieu-Daudé
2018-02-11 12:04   ` Markus Armbruster
2018-02-12 16:10     ` Eric Blake
2018-02-11  0:40 ` [Qemu-devel] [PATCH 2/3] qapi: Rename QMP and QGA schema files Eric Blake
2018-02-11  9:49   ` Markus Armbruster
2018-02-12 16:12     ` Eric Blake
2018-02-15 19:03       ` Michael Roth
2018-02-11  0:40 ` [Qemu-devel] [PATCH 3/3] qapi: Rename .json to .qapi Eric Blake
2018-02-12  9:52   ` Daniel P. Berrangé
2018-02-12 10:17     ` Marc-André Lureau
2018-02-23 17:15       ` Markus Armbruster
2018-02-11  9:44 ` [Qemu-devel] [PATCH 0/3] QAPI file renames Markus Armbruster
2018-02-12 16:13   ` Eric Blake

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180211004013.10784-2-eblake@redhat.com \
    --to=eblake@redhat.com \
    --cc=armbru@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.