2018-02-08 20:55:31 +01:00
|
|
|
From 0b18b7d8af17cb10779ca45efd40d791595d7cf5 Mon Sep 17 00:00:00 2001
|
2018-01-26 00:50:30 +01:00
|
|
|
From: "Daniel P. Berrange" <berrange@redhat.com>
|
2018-02-08 20:55:31 +01:00
|
|
|
Date: Tue, 16 Jan 2018 13:42:09 +0000
|
2018-01-26 00:50:30 +01:00
|
|
|
Subject: [PATCH] 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.
|
|
|
|
|
|
2018-02-08 20:55:31 +01:00
|
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
2018-01-26 00:50:30 +01:00
|
|
|
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
2018-02-08 20:55:31 +01:00
|
|
|
Message-Id: <20180116134217.8725-7-berrange@redhat.com>
|
|
|
|
|
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
|
|
(cherry picked from commit 46ec4fcea95204a8e5bab9295cbfaa3606d78dc9)
|
|
|
|
|
[BR: BSC#1077564]
|
|
|
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
2018-01-26 00:50:30 +01:00
|
|
|
---
|
|
|
|
|
tests/Makefile.include | 6 +++---
|
|
|
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/tests/Makefile.include b/tests/Makefile.include
|
|
|
|
|
index 199b7bbddd..f4a05a82c1 100644
|
|
|
|
|
--- a/tests/Makefile.include
|
|
|
|
|
+++ b/tests/Makefile.include
|
|
|
|
|
@@ -909,10 +909,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
|
