diff options
| author | Markus Armbruster <armbru@redhat.com> | 2021-03-23 10:40:12 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2021-03-23 22:31:05 +0100 |
| commit | 492db12ec3b42be6f971ba8436e080bc096b58b5 (patch) | |
| tree | fe98aa14e53eaf2adb4a030fa4d9ba8a5eb69c2f /tests | |
| parent | 3e6c8a633113fb6a60369c40cf2061de50727bf6 (diff) | |
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 <armbru@redhat.com>
Message-Id: <20210323094025.3569441-16-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/qapi-schema/meson.build | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/redefined-builtin.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/redefined-predefined.err | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/redefined-predefined.json (renamed from tests/qapi-schema/redefined-builtin.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/redefined-predefined.out (renamed from tests/qapi-schema/redefined-builtin.out) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index ba11cb76ac..664f9ee22d 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 92bc62dc76..0000000000 --- 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-predefined.err b/tests/qapi-schema/redefined-predefined.err new file mode 100644 index 0000000000..2924dde60b --- /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-builtin.json b/tests/qapi-schema/redefined-predefined.json index cad555cc73..cad555cc73 100644 --- a/tests/qapi-schema/redefined-builtin.json +++ b/tests/qapi-schema/redefined-predefined.json diff --git a/tests/qapi-schema/redefined-builtin.out b/tests/qapi-schema/redefined-predefined.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/redefined-builtin.out +++ b/tests/qapi-schema/redefined-predefined.out |