[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/12] qapi: Move empty-enum to compile-time test
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 05/12] qapi: Move empty-enum to compile-time test |
Date: |
Thu, 15 Oct 2015 09:51:38 +0200 |
From: Eric Blake <address@hidden>
Rather than just asserting that we can parse an empty enum,
let's also make sure we can compile it, by including it in
qapi-schema-test.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/Makefile | 1 -
tests/qapi-schema/enum-empty.err | 0
tests/qapi-schema/enum-empty.exit | 1 -
tests/qapi-schema/enum-empty.json | 2 --
tests/qapi-schema/enum-empty.out | 2 --
tests/qapi-schema/qapi-schema-test.json | 6 ++++++
tests/qapi-schema/qapi-schema-test.out | 1 +
7 files changed, 7 insertions(+), 6 deletions(-)
delete mode 100644 tests/qapi-schema/enum-empty.err
delete mode 100644 tests/qapi-schema/enum-empty.exit
delete mode 100644 tests/qapi-schema/enum-empty.json
delete mode 100644 tests/qapi-schema/enum-empty.out
diff --git a/tests/Makefile b/tests/Makefile
index 9a6601d..e058312 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -260,7 +260,6 @@ qapi-schema += enum-bad-name.json
qapi-schema += enum-bad-prefix.json
qapi-schema += enum-clash-member.json
qapi-schema += enum-dict-member.json
-qapi-schema += enum-empty.json
qapi-schema += enum-int-member.json
qapi-schema += enum-max-member.json
qapi-schema += enum-missing-data.json
diff --git a/tests/qapi-schema/enum-empty.err b/tests/qapi-schema/enum-empty.err
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/qapi-schema/enum-empty.exit
b/tests/qapi-schema/enum-empty.exit
deleted file mode 100644
index 573541a..0000000
--- a/tests/qapi-schema/enum-empty.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/tests/qapi-schema/enum-empty.json
b/tests/qapi-schema/enum-empty.json
deleted file mode 100644
index 40d4e85..0000000
--- a/tests/qapi-schema/enum-empty.json
+++ /dev/null
@@ -1,2 +0,0 @@
-# An empty enum, although unusual, is currently acceptable
-{ 'enum': 'MyEnum', 'data': [ ] }
diff --git a/tests/qapi-schema/enum-empty.out b/tests/qapi-schema/enum-empty.out
deleted file mode 100644
index a449d45..0000000
--- a/tests/qapi-schema/enum-empty.out
+++ /dev/null
@@ -1,2 +0,0 @@
-object :empty
-enum MyEnum []
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index abe59fd..c8cd2dd 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -1,11 +1,17 @@
# *-*- Mode: Python -*-*
+# This file is a stress test of supported qapi constructs that must
+# parse and compile correctly.
+
# for testing enums
{ 'enum': 'EnumOne',
'data': [ 'value1', 'value2', 'value3' ] }
{ 'struct': 'NestedEnumsOne',
'data': { 'enum1': 'EnumOne', '*enum2': 'EnumOne', 'enum3': 'EnumOne',
'*enum4': 'EnumOne' } }
+# An empty enum, although unusual, is currently acceptable
+{ 'enum': 'MyEnum', 'data': [ ] }
+
# for testing override of default naming heuristic
{ 'enum': 'QEnumTwo',
'prefix': 'QENUM_TWO',
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index 8f81784..e3504ab 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -86,6 +86,7 @@ object EventStructOne
member struct1: UserDefOne optional=False
member string: str optional=False
member enum2: EnumOne optional=True
+enum MyEnum []
object NestedEnumsOne
member enum1: EnumOne optional=False
member enum2: EnumOne optional=True
--
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, 2015/10/15
- [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 <=
- [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