Message ID | 20180115170243.24578-6-berrange@redhat.com |
---|---|
State | New |
Headers | show |
Series | Support building with py2 or py3 | expand |
On 01/15/2018 11:02 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. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > tests/Makefile.include | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
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
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(-)