[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/17] tests/qapi-schema: Cover duplicate 'Features:' line
From: |
Markus Armbruster |
Subject: |
[PULL 03/17] tests/qapi-schema: Cover duplicate 'Features:' line |
Date: |
Mon, 26 Feb 2024 11:49:40 +0100 |
We don't actually recognize the second 'Features:' line. Instead, we
treat it as an untagged section.
If it was followed by feature description, we'd reject that like
"description of '@feat2:' follows a section". Less than clear.
To be improved shortly.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240216145841.2099240-3-armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qapi-schema/doc-duplicate-features.err | 0
tests/qapi-schema/doc-duplicate-features.json | 11 ++++++++++
tests/qapi-schema/doc-duplicate-features.out | 22 +++++++++++++++++++
tests/qapi-schema/meson.build | 1 +
4 files changed, 34 insertions(+)
create mode 100644 tests/qapi-schema/doc-duplicate-features.err
create mode 100644 tests/qapi-schema/doc-duplicate-features.json
create mode 100644 tests/qapi-schema/doc-duplicate-features.out
diff --git a/tests/qapi-schema/doc-duplicate-features.err
b/tests/qapi-schema/doc-duplicate-features.err
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/qapi-schema/doc-duplicate-features.json
b/tests/qapi-schema/doc-duplicate-features.json
new file mode 100644
index 0000000000..a4d559e740
--- /dev/null
+++ b/tests/qapi-schema/doc-duplicate-features.json
@@ -0,0 +1,11 @@
+# Duplicate 'Features:' line
+
+##
+# @foo:
+#
+# Features:
+# @feat: mumble
+#
+# Features:
+##
+{ 'command': 'foo', 'features': ['feat'] }
diff --git a/tests/qapi-schema/doc-duplicate-features.out
b/tests/qapi-schema/doc-duplicate-features.out
new file mode 100644
index 0000000000..43bfe1034b
--- /dev/null
+++ b/tests/qapi-schema/doc-duplicate-features.out
@@ -0,0 +1,22 @@
+module ./builtin
+object q_empty
+enum QType
+ prefix QTYPE
+ member none
+ member qnull
+ member qnum
+ member qstring
+ member qdict
+ member qlist
+ member qbool
+module doc-duplicate-features.json
+command foo None -> None
+ gen=True success_response=True boxed=False oob=False preconfig=False
+ feature feat
+doc symbol=foo
+ body=
+
+ feature=feat
+mumble
+ section=None
+Features:
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 44a9385563..4c714c792f 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -66,6 +66,7 @@ schemas = [
'doc-bad-union-member.json',
'doc-before-include.json',
'doc-before-pragma.json',
+ 'doc-duplicate-features.json',
'doc-duplicated-arg.json',
'doc-duplicated-return.json',
'doc-duplicated-since.json',
--
2.43.0
- [PULL 15/17] qapi: Rewrite doc comment parser, (continued)
- [PULL 15/17] qapi: Rewrite doc comment parser, Markus Armbruster, 2024/02/26
- [PULL 02/17] tests/qapi-schema: Fix test 'QAPI rST doc', Markus Armbruster, 2024/02/26
- [PULL 09/17] qapi: Rename QAPIDoc.Section.name to .tag, Markus Armbruster, 2024/02/26
- [PULL 04/17] tests/qapi-schema: Cover 'Features:' not followed by descriptions, Markus Armbruster, 2024/02/26
- [PULL 05/17] sphinx/qapidoc: Drop code to generate doc for simple union branch, Markus Armbruster, 2024/02/26
- [PULL 16/17] qapi: Reject multiple and empty feature descriptions, Markus Armbruster, 2024/02/26
- [PULL 13/17] qapi: Call QAPIDoc.check() always, Markus Armbruster, 2024/02/26
- [PULL 06/17] qapi: Improve error position for bogus argument descriptions, Markus Armbruster, 2024/02/26
- [PULL 11/17] qapi: Require descriptions and tagged sections to be indented, Markus Armbruster, 2024/02/26
- [PULL 08/17] qapi: Improve error message for empty doc sections, Markus Armbruster, 2024/02/26
- [PULL 03/17] tests/qapi-schema: Cover duplicate 'Features:' line,
Markus Armbruster <=
- [PULL 07/17] qapi: Improve error position for bogus invalid "Returns" section, Markus Armbruster, 2024/02/26
- [PULL 10/17] qapi: Reject section heading in the middle of a doc comment, Markus Armbruster, 2024/02/26
- Re: [PULL 00/17] QAPI patches patches for 2024-02-26, Peter Maydell, 2024/02/26