From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
"Fam Zheng" <famz@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Eric Blake" <eblake@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>
Subject: [Qemu-devel] [PATCH v4 05/13] qapi: remove '-q' arg to diff when comparing QAPI output
Date: Mon, 15 Jan 2018 17:02:35 +0000 [thread overview]
Message-ID: <20180115170243.24578-6-berrange@redhat.com> (raw)
In-Reply-To: <20180115170243.24578-1-berrange@redhat.com>
When the qapi schema tests fail they merely print that the expected
output didn't match the actual output. This is largely useless when
trying diagnose what went wrong. Removing the '-q' arg to diff
means that it is still silent on successful tests, but when it
fails we'll see details of the incorrect output.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
tests/Makefile.include | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 39a4b5359d..d65fb4e1b3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -908,10 +908,10 @@ $(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
$^ >$*.test.out 2>$*.test.err; \
echo $$? >$*.test.exit, \
"TEST","$*.out")
- @diff -q $(SRC_PATH)/$*.out $*.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 -q $(SRC_PATH)/$*.err -
- @diff -q $(SRC_PATH)/$*.exit $*.test.exit
+ @perl -p -e 's|\Q$(SRC_PATH)\E/||g' $*.test.err | diff $(SRC_PATH)/$*.err -
+ @diff $(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
--
2.14.3
next prev parent reply other threads:[~2018-01-15 17:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-15 17:02 [Qemu-devel] [PATCH v4 00/13] Support building with py2 or py3 Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 01/13] qapi: use items()/values() intead of iteritems()/itervalues() Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 02/13] qapi: Use OrderedDict from standard library if available Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 03/13] qapi: adapt to moved location of StringIO module in py3 Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 04/13] qapi: Adapt to moved location of 'maketrans' function " Daniel P. Berrange
2018-01-15 17:18 ` Eric Blake
2018-01-15 17:02 ` Daniel P. Berrange [this message]
2018-01-15 17:08 ` [Qemu-devel] [PATCH v4 05/13] qapi: remove '-q' arg to diff when comparing QAPI output Eric Blake
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 06/13] qapi: ensure stable sort ordering when checking QAPI entities Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 07/13] qapi: force a UTF-8 locale for running Python Daniel P. Berrange
2018-01-15 17:15 ` Eric Blake
2018-01-15 17:28 ` Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 08/13] scripts: ensure signrom treats data as bytes Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 09/13] configure: allow use of python 3 Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 10/13] input: add missing JIS keys to virtio input Daniel P. Berrange
2018-01-15 17:17 ` Eric Blake
2018-01-15 17:30 ` Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 11/13] ui: update keycodemapdb to get py3 fixes Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 12/13] travis: improve python version test coverage Daniel P. Berrange
2018-01-15 17:02 ` [Qemu-devel] [PATCH v4 13/13] docker: change Fedora images to run with python3 Daniel P. Berrange
2018-01-17 2:28 ` Fam Zheng
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=20180115170243.24578-6-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=pbonzini@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).