From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1elHEz-0004nX-Bs for qemu-devel@nongnu.org; Mon, 12 Feb 2018 11:46:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1elHEv-0002YF-CU for qemu-devel@nongnu.org; Mon, 12 Feb 2018 11:46:05 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:52848 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1elHEv-0002Xw-82 for qemu-devel@nongnu.org; Mon, 12 Feb 2018 11:46:01 -0500 Date: Mon, 12 Feb 2018 16:45:56 +0000 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Message-ID: <20180212164556.GW4071@redhat.com> Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= References: <20180116134217.8725-1-berrange@redhat.com> <20180116134217.8725-7-berrange@redhat.com> <46fa1e33-70e7-559e-11b9-0ec53bfb8782@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <46fa1e33-70e7-559e-11b9-0ec53bfb8782@redhat.com> Subject: Re: [Qemu-devel] [PATCH v5 06/14] qapi: remove '-q' arg to diff when comparing QAPI output List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Fam Zheng , Eduardo Habkost , Markus Armbruster , Paolo Bonzini , Alex =?utf-8?Q?Benn=C3=A9e?= , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= On Fri, Feb 09, 2018 at 05:39:58PM -0600, Eric Blake wrote: > On 01/16/2018 07:42 AM, Daniel P. Berrange wrote: > > 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. > > > > Reviewed-by: Eric Blake > > Signed-off-by: Daniel P. Berrange > > --- > > 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 > > And just now I'm noticing that this produces an ed-script diff (which is > useless), instead of a context diff. We want -c. I guess I'll be > submitting the obvious followup patch. Well not entirely useless - it showed me the problems that we happening with the py3 port, but yeah, a saner diff format would be nice :-) Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|