Eric Blake <ebl...@redhat.com> writes: > 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 <ebl...@redhat.com> >> Signed-off-by: Daniel P. Berrange <berra...@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 > > 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.
I'd very much prefer -u. There's a diff -q left a few lines down.