From 492db12ec3b42be6f971ba8436e080bc096b58b5 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 23 Mar 2021 10:40:12 +0100 Subject: tests/qapi-schema: Rename redefined-builtin to redefined-predefined The previous commit changed this test to clash with a predefined enum type, not a built-in type. Adjust its name. Signed-off-by: Markus Armbruster Message-Id: <20210323094025.3569441-16-armbru@redhat.com> Reviewed-by: Eric Blake --- tests/qapi-schema/meson.build | 2 +- tests/qapi-schema/redefined-builtin.err | 2 -- tests/qapi-schema/redefined-builtin.json | 2 -- tests/qapi-schema/redefined-builtin.out | 0 tests/qapi-schema/redefined-predefined.err | 2 ++ tests/qapi-schema/redefined-predefined.json | 2 ++ tests/qapi-schema/redefined-predefined.out | 0 7 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 tests/qapi-schema/redefined-builtin.err delete mode 100644 tests/qapi-schema/redefined-builtin.json delete mode 100644 tests/qapi-schema/redefined-builtin.out create mode 100644 tests/qapi-schema/redefined-predefined.err create mode 100644 tests/qapi-schema/redefined-predefined.json create mode 100644 tests/qapi-schema/redefined-predefined.out (limited to 'tests') diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index ba11cb7..664f9ee 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -152,9 +152,9 @@ schemas = [ 'pragma-returns-whitelist-crap.json', 'qapi-schema-test.json', 'quoted-structural-chars.json', - 'redefined-builtin.json', 'redefined-command.json', 'redefined-event.json', + 'redefined-predefined.json', 'redefined-type.json', 'reserved-command-q.json', 'reserved-enum-q.json', diff --git a/tests/qapi-schema/redefined-builtin.err b/tests/qapi-schema/redefined-builtin.err deleted file mode 100644 index 92bc62d..0000000 --- a/tests/qapi-schema/redefined-builtin.err +++ /dev/null @@ -1,2 +0,0 @@ -redefined-builtin.json: In struct 'QType': -redefined-builtin.json:2: enum type 'QType' is already defined diff --git a/tests/qapi-schema/redefined-builtin.json b/tests/qapi-schema/redefined-builtin.json deleted file mode 100644 index cad555c..0000000 --- a/tests/qapi-schema/redefined-builtin.json +++ /dev/null @@ -1,2 +0,0 @@ -# we reject types that clash with predefined types -{ 'struct': 'QType', 'data': { 'myint': 'size' } } diff --git a/tests/qapi-schema/redefined-builtin.out b/tests/qapi-schema/redefined-builtin.out deleted file mode 100644 index e69de29..0000000 diff --git a/tests/qapi-schema/redefined-predefined.err b/tests/qapi-schema/redefined-predefined.err new file mode 100644 index 0000000..2924dde --- /dev/null +++ b/tests/qapi-schema/redefined-predefined.err @@ -0,0 +1,2 @@ +redefined-predefined.json: In struct 'QType': +redefined-predefined.json:2: enum type 'QType' is already defined diff --git a/tests/qapi-schema/redefined-predefined.json b/tests/qapi-schema/redefined-predefined.json new file mode 100644 index 0000000..cad555c --- /dev/null +++ b/tests/qapi-schema/redefined-predefined.json @@ -0,0 +1,2 @@ +# we reject types that clash with predefined types +{ 'struct': 'QType', 'data': { 'myint': 'size' } } diff --git a/tests/qapi-schema/redefined-predefined.out b/tests/qapi-schema/redefined-predefined.out new file mode 100644 index 0000000..e69de29 -- cgit v1.1