Commit 46ec4fce authored by Daniel P. Berrangé's avatar Daniel P. Berrangé Committed by Eduardo Habkost
Browse files

qapi: remove '-q' arg to diff when comparing QAPI output 



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: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarDaniel P. Berrange <berrange@redhat.com>
Message-Id: <20180116134217.8725-7-berrange@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 52c4272c

tests/Makefile.include

+3 −3
Original line number Diff line number Diff line
@@ -917,10 +917,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