From nobody Thu Nov 6 16:08:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489387508001314.63043651552664; Sun, 12 Mar 2017 23:45:08 -0700 (PDT) Received: from localhost ([::1]:50475 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnJj8-0003hR-Gt for importer@patchew.org; Mon, 13 Mar 2017 02:45:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52402) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnJJq-0007aq-KR for qemu-devel@nongnu.org; Mon, 13 Mar 2017 02:19:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnJJm-0003dK-5u for qemu-devel@nongnu.org; Mon, 13 Mar 2017 02:18:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40748) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnJJl-0003aN-PA for qemu-devel@nongnu.org; Mon, 13 Mar 2017 02:18:53 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D22B04DD49; Mon, 13 Mar 2017 06:18:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v2D6Iqvl003266 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 13 Mar 2017 02:18:53 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 7680B11384B4; Mon, 13 Mar 2017 07:18:47 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 13 Mar 2017 07:18:30 +0100 Message-Id: <1489385927-6735-31-git-send-email-armbru@redhat.com> In-Reply-To: <1489385927-6735-1-git-send-email-armbru@redhat.com> References: <1489385927-6735-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Mon, 13 Mar 2017 06:18:53 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH for-2.9 30/47] tests/qapi-schema: Improve doc / expression mismatch coverage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" New test doc-bad-expr.json shows we fail to reject a misplaced expression comment. New test doc-no-symbol.json shows a bad error message. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- tests/Makefile.include | 2 ++ tests/qapi-schema/doc-bad-expr.err | 0 tests/qapi-schema/doc-bad-expr.exit | 1 + tests/qapi-schema/doc-bad-expr.json | 8 ++++++++ tests/qapi-schema/doc-bad-expr.out | 4 ++++ tests/qapi-schema/doc-no-symbol.err | 1 + tests/qapi-schema/doc-no-symbol.exit | 1 + tests/qapi-schema/doc-no-symbol.json | 7 +++++++ tests/qapi-schema/doc-no-symbol.out | 0 9 files changed, 24 insertions(+) create mode 100644 tests/qapi-schema/doc-bad-expr.err create mode 100644 tests/qapi-schema/doc-bad-expr.exit create mode 100644 tests/qapi-schema/doc-bad-expr.json create mode 100644 tests/qapi-schema/doc-bad-expr.out create mode 100644 tests/qapi-schema/doc-no-symbol.err create mode 100644 tests/qapi-schema/doc-no-symbol.exit create mode 100644 tests/qapi-schema/doc-no-symbol.json create mode 100644 tests/qapi-schema/doc-no-symbol.out diff --git a/tests/Makefile.include b/tests/Makefile.include index 7230977..800acbf 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -368,6 +368,7 @@ qapi-schema +=3D base-cycle-indirect.json qapi-schema +=3D command-int.json qapi-schema +=3D comments.json qapi-schema +=3D doc-bad-args.json +qapi-schema +=3D doc-bad-expr.json qapi-schema +=3D doc-bad-symbol.json qapi-schema +=3D doc-duplicated-arg.json qapi-schema +=3D doc-duplicated-return.json @@ -385,6 +386,7 @@ qapi-schema +=3D doc-missing.json qapi-schema +=3D doc-missing-colon.json qapi-schema +=3D doc-missing-expr.json qapi-schema +=3D doc-missing-space.json +qapi-schema +=3D doc-no-symbol.json qapi-schema +=3D double-data.json qapi-schema +=3D double-type.json qapi-schema +=3D duplicate-key.json diff --git a/tests/qapi-schema/doc-bad-expr.err b/tests/qapi-schema/doc-bad= -expr.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/doc-bad-expr.exit b/tests/qapi-schema/doc-ba= d-expr.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/doc-bad-expr.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/doc-bad-expr.json b/tests/qapi-schema/doc-ba= d-expr.json new file mode 100644 index 0000000..ec1fbf2 --- /dev/null +++ b/tests/qapi-schema/doc-bad-expr.json @@ -0,0 +1,8 @@ +# Doc comment separated from defining expression by non-defining expression +# BUG: not rejected + +## +# @foo: +## +{ 'include': 'empty.json' } +{ 'struct': 'foo', 'data': {} } diff --git a/tests/qapi-schema/doc-bad-expr.out b/tests/qapi-schema/doc-bad= -expr.out new file mode 100644 index 0000000..236a849 --- /dev/null +++ b/tests/qapi-schema/doc-bad-expr.out @@ -0,0 +1,4 @@ +enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat'= , 'qbool'] + prefix QTYPE +object foo +object q_empty diff --git a/tests/qapi-schema/doc-no-symbol.err b/tests/qapi-schema/doc-no= -symbol.err new file mode 100644 index 0000000..727966c --- /dev/null +++ b/tests/qapi-schema/doc-no-symbol.err @@ -0,0 +1 @@ +tests/qapi-schema/doc-no-symbol.json:4: Definition of 'foo' follows docume= ntation for 'None' diff --git a/tests/qapi-schema/doc-no-symbol.exit b/tests/qapi-schema/doc-n= o-symbol.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/qapi-schema/doc-no-symbol.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/doc-no-symbol.json b/tests/qapi-schema/doc-n= o-symbol.json new file mode 100644 index 0000000..ee86ca1 --- /dev/null +++ b/tests/qapi-schema/doc-no-symbol.json @@ -0,0 +1,7 @@ +# Documentation for expression lacks symbol +# BUG: Error message claims it has symbol 'None' + +## +# foo: +## +{ 'command': 'foo', 'data': {'a': 'int'} } diff --git a/tests/qapi-schema/doc-no-symbol.out b/tests/qapi-schema/doc-no= -symbol.out new file mode 100644 index 0000000..e69de29 --=20 2.7.4