From: Eric Blake <eblake@redhat.com>
To: Markus Armbruster <armbru@redhat.com>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 1/3] qapi: Pass '-u' when doing non-silent diff
Date: Mon, 12 Feb 2018 10:10:26 -0600 [thread overview]
Message-ID: <2b0e0c59-7207-991c-06fd-0457610f019c@redhat.com> (raw)
In-Reply-To: <87inb3g2an.fsf@dusky.pond.sub.org>
On 02/11/2018 06:04 AM, Markus Armbruster wrote:
> Eric Blake <eblake@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 <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
>
> 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
next prev parent reply other threads:[~2018-02-12 16:10 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 ` [Qemu-devel] [PATCH 1/3] qapi: Pass '-u' when doing non-silent diff Eric Blake
2018-02-11 4:11 ` Philippe Mathieu-Daudé
2018-02-11 12:04 ` Markus Armbruster
2018-02-12 16:10 ` Eric Blake [this message]
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=2b0e0c59-7207-991c-06fd-0457610f019c@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.