From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR1sp-0005EF-HG for qemu-devel@nongnu.org; Fri, 21 Mar 2014 12:01:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WR1sl-0000wT-5A for qemu-devel@nongnu.org; Fri, 21 Mar 2014 12:01:23 -0400 Received: from lputeaux-656-01-25-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:56373 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WR1sk-0000vi-Vq for qemu-devel@nongnu.org; Fri, 21 Mar 2014 12:01:19 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 21 Mar 2014 17:01:11 +0100 Message-Id: <1395417673-17710-1-git-send-email-benoit.canet@irqsave.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 0/2] Create and include directive for QAPI JSON files List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Beno=C3=AEt=20Canet?= , wenchaoqemu@gmail.com, armbru@redhat.com, lcapitulino@redhat.com, anthony@codemonkey.ws The first patch make an error path in the test more explicit. The second create an include directive for QAPI JSON files. The purpose of this series is to be able to add QMP to qemu-nbd in a not = so distant future. Best regards Beno=C3=AEt Beno=C3=AEt Canet (2): test-qapi: Make test-qapi.py spit useful error messages. qapi: Create an include directive for use in the JSON description files. Makefile | 24 +++++------ scripts/qapi-commands.py | 8 +++- scripts/qapi-types.py | 8 +++- scripts/qapi-visit.py | 8 +++- scripts/qapi.py | 46 ++++++++++++++++= +----- tests/Makefile | 16 ++++---- tests/qapi-schema/duplicate-key.err | 2 +- .../qapi-schema/flat-union-invalid-branch-key.err | 2 +- .../flat-union-invalid-discriminator.err | 2 +- tests/qapi-schema/flat-union-no-base.err | 2 +- .../flat-union-string-discriminator.err | 2 +- tests/qapi-schema/funny-char.err | 2 +- tests/qapi-schema/include.err | 0 tests/qapi-schema/include.exit | 1 + tests/qapi-schema/include.json | 4 ++ tests/qapi-schema/include.out | 8 ++++ tests/qapi-schema/include/include.json | 7 ++++ tests/qapi-schema/include_loop.err | 0 tests/qapi-schema/include_loop.exit | 1 + tests/qapi-schema/include_loop.json | 1 + tests/qapi-schema/include_loop.out | 1 + tests/qapi-schema/missing-colon.err | 2 +- tests/qapi-schema/missing-comma-list.err | 2 +- tests/qapi-schema/missing-comma-object.err | 2 +- tests/qapi-schema/non-objects.err | 2 +- tests/qapi-schema/quoted-structural-chars.err | 2 +- tests/qapi-schema/test-qapi.py | 6 +-- tests/qapi-schema/trailing-comma-list.err | 2 +- tests/qapi-schema/trailing-comma-object.err | 2 +- tests/qapi-schema/unclosed-list.err | 2 +- tests/qapi-schema/unclosed-object.err | 2 +- tests/qapi-schema/unclosed-string.err | 2 +- tests/qapi-schema/union-invalid-base.err | 2 +- 33 files changed, 118 insertions(+), 55 deletions(-) create mode 100644 tests/qapi-schema/include.err create mode 100644 tests/qapi-schema/include.exit create mode 100644 tests/qapi-schema/include.json create mode 100644 tests/qapi-schema/include.out create mode 100644 tests/qapi-schema/include/include.json create mode 100644 tests/qapi-schema/include_loop.err create mode 100644 tests/qapi-schema/include_loop.exit create mode 100644 tests/qapi-schema/include_loop.json create mode 100644 tests/qapi-schema/include_loop.out --=20 1.8.3.2