[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/12] qapi: Drop redundant flat-union-reverse-define
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 07/12] qapi: Drop redundant flat-union-reverse-define test |
Date: |
Thu, 15 Oct 2015 09:51:40 +0200 |
From: Eric Blake <address@hidden>
As of commit 8c3f8e77, we test compilation of forward references
for a struct base type (UserDefOne), flat union base type
(UserDefUnionBase), and flat union branch type
(UserDefFlatUnion2). The only remaining forward reference being
tested for parsing in flat-union-reverse-define was a forward
enum declaration. Once we make sure that always compiles,
the smaller parse-only test is redundant and can be deleted.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/Makefile | 1 -
tests/qapi-schema/flat-union-reverse-define.err | 0
tests/qapi-schema/flat-union-reverse-define.exit | 1 -
tests/qapi-schema/flat-union-reverse-define.json | 17 -----------------
tests/qapi-schema/flat-union-reverse-define.out | 13 -------------
tests/qapi-schema/qapi-schema-test.json | 11 +++++++----
6 files changed, 7 insertions(+), 36 deletions(-)
delete mode 100644 tests/qapi-schema/flat-union-reverse-define.err
delete mode 100644 tests/qapi-schema/flat-union-reverse-define.exit
delete mode 100644 tests/qapi-schema/flat-union-reverse-define.json
delete mode 100644 tests/qapi-schema/flat-union-reverse-define.out
diff --git a/tests/Makefile b/tests/Makefile
index 3512f8c..35a63f3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -286,7 +286,6 @@ qapi-schema += flat-union-invalid-branch-key.json
qapi-schema += flat-union-invalid-discriminator.json
qapi-schema += flat-union-no-base.json
qapi-schema += flat-union-optional-discriminator.json
-qapi-schema += flat-union-reverse-define.json
qapi-schema += flat-union-string-discriminator.json
qapi-schema += funny-char.json
qapi-schema += ident-with-escape.json
diff --git a/tests/qapi-schema/flat-union-reverse-define.err
b/tests/qapi-schema/flat-union-reverse-define.err
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/qapi-schema/flat-union-reverse-define.exit
b/tests/qapi-schema/flat-union-reverse-define.exit
deleted file mode 100644
index 573541a..0000000
--- a/tests/qapi-schema/flat-union-reverse-define.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/qapi-schema/flat-union-reverse-define.json
b/tests/qapi-schema/flat-union-reverse-define.json
deleted file mode 100644
index 648bbfe..0000000
--- a/tests/qapi-schema/flat-union-reverse-define.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{ 'union': 'TestUnion',
- 'base': 'TestBase',
- 'discriminator': 'enum1',
- 'data': { 'value1': 'TestTypeA',
- 'value2': 'TestTypeB' } }
-
-{ 'struct': 'TestBase',
- 'data': { 'enum1': 'TestEnum' } }
-
-{ 'enum': 'TestEnum',
- 'data': [ 'value1', 'value2' ] }
-
-{ 'struct': 'TestTypeA',
- 'data': { 'string': 'str' } }
-
-{ 'struct': 'TestTypeB',
- 'data': { 'integer': 'int' } }
diff --git a/tests/qapi-schema/flat-union-reverse-define.out
b/tests/qapi-schema/flat-union-reverse-define.out
deleted file mode 100644
index a5a9134..0000000
--- a/tests/qapi-schema/flat-union-reverse-define.out
+++ /dev/null
@@ -1,13 +0,0 @@
-object :empty
-object TestBase
- member enum1: TestEnum optional=False
-enum TestEnum ['value1', 'value2']
-object TestTypeA
- member string: str optional=False
-object TestTypeB
- member integer: int optional=False
-object TestUnion
- base TestBase
- tag enum1
- case value1: TestTypeA
- case value2: TestTypeB
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index 67c6bca..b48c6bd 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -4,10 +4,9 @@
# parse and compile correctly.
# for testing enums
-{ 'enum': 'EnumOne',
- 'data': [ 'value1', 'value2', 'value3' ] }
{ 'struct': 'NestedEnumsOne',
- 'data': { 'enum1': 'EnumOne', '*enum2': 'EnumOne', 'enum3': 'EnumOne',
'*enum4': 'EnumOne' } }
+ 'data': { 'enum1': 'EnumOne', # Intentional forward reference
+ '*enum2': 'EnumOne', 'enum3': 'EnumOne', '*enum4': 'EnumOne' } }
# An empty enum, although unusual, is currently acceptable
{ 'enum': 'MyEnum', 'data': [ ] }
@@ -20,7 +19,11 @@
# for testing nested structs
{ 'struct': 'UserDefOne',
'base': 'UserDefZero', # intentional forward reference
- 'data': { 'string': 'str', '*enum1': 'EnumOne' } }
+ 'data': { 'string': 'str',
+ '*enum1': 'EnumOne' } } # intentional forward reference
+
+{ 'enum': 'EnumOne',
+ 'data': [ 'value1', 'value2', 'value3' ] }
{ 'struct': 'UserDefZero',
'data': { 'integer': 'int' } }
--
2.4.3
- [Qemu-devel] [PULL 00/12] QAPI patches, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 01/12] qapi: Fix regression with '-netdev help', Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 04/12] qapi: Drop redundant alternate-good test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 12/12] qapi: Track location that created an implicit type, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 10/12] qapi: Lazy creation of array types, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 03/12] qapi: Prepare for errors during check(), Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 08/12] qapi: Drop redundant args-member-array test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 07/12] qapi: Drop redundant flat-union-reverse-define test,
Markus Armbruster <=
- [Qemu-devel] [PULL 06/12] qapi: Drop redundant returns-int test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 09/12] qapi: Don't use info as witness of implicit object type, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 05/12] qapi: Move empty-enum to compile-time test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 02/12] qapi: Use predicate callback to determine visit filtering, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 11/12] qapi: Create simple union type member earlier, Markus Armbruster, 2015/10/15
- Re: [Qemu-devel] [PULL 00/12] QAPI patches, Peter Maydell, 2015/10/16