From cfdd5bcad515a8371af59dba9625e31a6f6f733e Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 4 May 2015 09:05:16 -0600 Subject: [PATCH] qapi: Add tests of redefined expressions Demonstrate that the qapi generator doesn't deal very well with redefined expressions. At the parse level, they are silently accepted; and while the testsuite just stops at parsing, I've further tested that many of them cause generator crashes or invalid C code if they were appended to qapi-schema-test.json. A later patch will tighten things up and adjust the testsuite to match. Signed-off-by: Eric Blake Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- tests/Makefile | 2 ++ tests/qapi-schema/command-int.err | 0 tests/qapi-schema/command-int.exit | 1 + tests/qapi-schema/command-int.json | 3 +++ tests/qapi-schema/command-int.out | 3 +++ tests/qapi-schema/event-max.err | 0 tests/qapi-schema/event-max.exit | 1 + tests/qapi-schema/event-max.json | 2 ++ tests/qapi-schema/event-max.out | 3 +++ tests/qapi-schema/redefined-builtin.err | 0 tests/qapi-schema/redefined-builtin.exit | 1 + tests/qapi-schema/redefined-builtin.json | 2 ++ tests/qapi-schema/redefined-builtin.out | 3 +++ tests/qapi-schema/redefined-command.err | 0 tests/qapi-schema/redefined-command.exit | 1 + tests/qapi-schema/redefined-command.json | 3 +++ tests/qapi-schema/redefined-command.out | 4 ++++ tests/qapi-schema/redefined-event.err | 0 tests/qapi-schema/redefined-event.exit | 1 + tests/qapi-schema/redefined-event.json | 3 +++ tests/qapi-schema/redefined-event.out | 4 ++++ tests/qapi-schema/redefined-type.err | 0 tests/qapi-schema/redefined-type.exit | 1 + tests/qapi-schema/redefined-type.json | 3 +++ tests/qapi-schema/redefined-type.out | 4 ++++ 25 files changed, 45 insertions(+) create mode 100644 tests/qapi-schema/command-int.err create mode 100644 tests/qapi-schema/command-int.exit create mode 100644 tests/qapi-schema/command-int.json create mode 100644 tests/qapi-schema/command-int.out create mode 100644 tests/qapi-schema/event-max.err create mode 100644 tests/qapi-schema/event-max.exit create mode 100644 tests/qapi-schema/event-max.json create mode 100644 tests/qapi-schema/event-max.out create mode 100644 tests/qapi-schema/redefined-builtin.err create mode 100644 tests/qapi-schema/redefined-builtin.exit create mode 100644 tests/qapi-schema/redefined-builtin.json create mode 100644 tests/qapi-schema/redefined-builtin.out create mode 100644 tests/qapi-schema/redefined-command.err create mode 100644 tests/qapi-schema/redefined-command.exit create mode 100644 tests/qapi-schema/redefined-command.json create mode 100644 tests/qapi-schema/redefined-command.out create mode 100644 tests/qapi-schema/redefined-event.err create mode 100644 tests/qapi-schema/redefined-event.exit create mode 100644 tests/qapi-schema/redefined-event.json create mode 100644 tests/qapi-schema/redefined-event.out create mode 100644 tests/qapi-schema/redefined-type.err create mode 100644 tests/qapi-schema/redefined-type.exit create mode 100644 tests/qapi-schema/redefined-type.json create mode 100644 tests/qapi-schema/redefined-type.out diff --git a/tests/Makefile b/tests/Makefile index 835ec9cb4e..c27940c417 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -214,6 +214,8 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \ missing-type.json bad-ident.json ident-with-escape.json \ double-type.json bad-base.json bad-type-bool.json bad-type-int.json \ bad-type-dict.json double-data.json unknown-expr-key.json \ + redefined-type.json redefined-command.json redefined-builtin.json \ + redefined-event.json command-int.json event-max.json \ missing-colon.json missing-comma-list.json \ missing-comma-object.json non-objects.json \ qapi-schema-test.json quoted-structural-chars.json \ diff --git a/tests/qapi-schema/command-int.err b/tests/qapi-schema/command-int.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/command-int.exit b/tests/qapi-schema/command-int.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/command-int.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/command-int.json b/tests/qapi-schema/command-int.json new file mode 100644 index 0000000000..fcbb643c44 --- /dev/null +++ b/tests/qapi-schema/command-int.json @@ -0,0 +1,3 @@ +# FIXME: we should reject collisions between commands and types +{ 'command': 'int', 'data': { 'character': 'str' }, + 'returns': { 'value': 'int' } } diff --git a/tests/qapi-schema/command-int.out b/tests/qapi-schema/command-int.out new file mode 100644 index 0000000000..d8e1854a04 --- /dev/null +++ b/tests/qapi-schema/command-int.out @@ -0,0 +1,3 @@ +[OrderedDict([('command', 'int'), ('data', OrderedDict([('character', 'str')])), ('returns', OrderedDict([('value', 'int')]))])] +[] +[] diff --git a/tests/qapi-schema/event-max.err b/tests/qapi-schema/event-max.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/event-max.exit b/tests/qapi-schema/event-max.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/event-max.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/event-max.json b/tests/qapi-schema/event-max.json new file mode 100644 index 0000000000..997c61c511 --- /dev/null +++ b/tests/qapi-schema/event-max.json @@ -0,0 +1,2 @@ +# FIXME: an event named 'MAX' would conflict with implicit C enum +{ 'event': 'MAX' } diff --git a/tests/qapi-schema/event-max.out b/tests/qapi-schema/event-max.out new file mode 100644 index 0000000000..010c42b3a9 --- /dev/null +++ b/tests/qapi-schema/event-max.out @@ -0,0 +1,3 @@ +[OrderedDict([('event', 'MAX')])] +[] +[] diff --git a/tests/qapi-schema/redefined-builtin.err b/tests/qapi-schema/redefined-builtin.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/redefined-builtin.exit b/tests/qapi-schema/redefined-builtin.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-builtin.json b/tests/qapi-schema/redefined-builtin.json new file mode 100644 index 0000000000..a10050dc73 --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.json @@ -0,0 +1,2 @@ +# FIXME: we should reject types that duplicate builtin names +{ 'type': 'size', 'data': { 'myint': 'size' } } diff --git a/tests/qapi-schema/redefined-builtin.out b/tests/qapi-schema/redefined-builtin.out new file mode 100644 index 0000000000..b0a9aea548 --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.out @@ -0,0 +1,3 @@ +[OrderedDict([('type', 'size'), ('data', OrderedDict([('myint', 'size')]))])] +[] +[OrderedDict([('type', 'size'), ('data', OrderedDict([('myint', 'size')]))])] diff --git a/tests/qapi-schema/redefined-command.err b/tests/qapi-schema/redefined-command.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/redefined-command.exit b/tests/qapi-schema/redefined-command.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/redefined-command.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-command.json b/tests/qapi-schema/redefined-command.json new file mode 100644 index 0000000000..d8c9975e1c --- /dev/null +++ b/tests/qapi-schema/redefined-command.json @@ -0,0 +1,3 @@ +# FIXME: we should reject commands defined more than once +{ 'command': 'foo', 'data': { 'one': 'str' } } +{ 'command': 'foo', 'data': { '*two': 'str' } } diff --git a/tests/qapi-schema/redefined-command.out b/tests/qapi-schema/redefined-command.out new file mode 100644 index 0000000000..44ddba60d5 --- /dev/null +++ b/tests/qapi-schema/redefined-command.out @@ -0,0 +1,4 @@ +[OrderedDict([('command', 'foo'), ('data', OrderedDict([('one', 'str')]))]), + OrderedDict([('command', 'foo'), ('data', OrderedDict([('*two', 'str')]))])] +[] +[] diff --git a/tests/qapi-schema/redefined-event.err b/tests/qapi-schema/redefined-event.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/redefined-event.exit b/tests/qapi-schema/redefined-event.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/redefined-event.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-event.json b/tests/qapi-schema/redefined-event.json new file mode 100644 index 0000000000..152cce720f --- /dev/null +++ b/tests/qapi-schema/redefined-event.json @@ -0,0 +1,3 @@ +# FIXME: we should reject duplicate events +{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } +{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } diff --git a/tests/qapi-schema/redefined-event.out b/tests/qapi-schema/redefined-event.out new file mode 100644 index 0000000000..261b183fc9 --- /dev/null +++ b/tests/qapi-schema/redefined-event.out @@ -0,0 +1,4 @@ +[OrderedDict([('event', 'EVENT_A'), ('data', OrderedDict([('myint', 'int')]))]), + OrderedDict([('event', 'EVENT_A'), ('data', OrderedDict([('myint', 'int')]))])] +[] +[] diff --git a/tests/qapi-schema/redefined-type.err b/tests/qapi-schema/redefined-type.err new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/qapi-schema/redefined-type.exit b/tests/qapi-schema/redefined-type.exit new file mode 100644 index 0000000000..573541ac97 --- /dev/null +++ b/tests/qapi-schema/redefined-type.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-type.json b/tests/qapi-schema/redefined-type.json new file mode 100644 index 0000000000..7972194824 --- /dev/null +++ b/tests/qapi-schema/redefined-type.json @@ -0,0 +1,3 @@ +# FIXME: we should reject types defined more than once +{ 'type': 'foo', 'data': { 'one': 'str' } } +{ 'enum': 'foo', 'data': [ 'two' ] } diff --git a/tests/qapi-schema/redefined-type.out b/tests/qapi-schema/redefined-type.out new file mode 100644 index 0000000000..b509e5776c --- /dev/null +++ b/tests/qapi-schema/redefined-type.out @@ -0,0 +1,4 @@ +[OrderedDict([('type', 'foo'), ('data', OrderedDict([('one', 'str')]))]), + OrderedDict([('enum', 'foo'), ('data', ['two'])])] +[{'enum_name': 'foo', 'enum_values': ['two']}] +[OrderedDict([('type', 'foo'), ('data', OrderedDict([('one', 'str')]))])]