[PATCH 15/28] tests/qapi-schema: Rename redefined-builtin to redefined-predefined

Markus Armbruster posted 28 patches 4 years, 10 months ago
Maintainers: Eric Blake <eblake@redhat.com>, Michael Roth <michael.roth@amd.com>, Markus Armbruster <armbru@redhat.com>
[PATCH 15/28] tests/qapi-schema: Rename redefined-builtin to redefined-predefined
Posted by Markus Armbruster 4 years, 10 months ago
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>
---
 tests/qapi-schema/meson.build                                   | 2 +-
 tests/qapi-schema/redefined-builtin.err                         | 2 --
 tests/qapi-schema/redefined-predefined.err                      | 2 ++
 .../{redefined-builtin.json => redefined-predefined.json}       | 0
 .../{redefined-builtin.out => redefined-predefined.out}         | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 delete mode 100644 tests/qapi-schema/redefined-builtin.err
 create mode 100644 tests/qapi-schema/redefined-predefined.err
 rename tests/qapi-schema/{redefined-builtin.json => redefined-predefined.json} (100%)
 rename tests/qapi-schema/{redefined-builtin.out => redefined-predefined.out} (100%)

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
similarity index 100%
rename from tests/qapi-schema/redefined-builtin.json
rename to tests/qapi-schema/redefined-predefined.json
diff --git a/tests/qapi-schema/redefined-builtin.out b/tests/qapi-schema/redefined-predefined.out
similarity index 100%
rename from tests/qapi-schema/redefined-builtin.out
rename to tests/qapi-schema/redefined-predefined.out
-- 
2.26.3


Re: [PATCH 15/28] tests/qapi-schema: Rename redefined-builtin to redefined-predefined
Posted by Eric Blake 4 years, 10 months ago
On 3/23/21 4:40 AM, Markus Armbruster wrote:
> 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>
> ---
>  tests/qapi-schema/meson.build                                   | 2 +-
>  tests/qapi-schema/redefined-builtin.err                         | 2 --
>  tests/qapi-schema/redefined-predefined.err                      | 2 ++
>  .../{redefined-builtin.json => redefined-predefined.json}       | 0
>  .../{redefined-builtin.out => redefined-predefined.out}         | 0
>  5 files changed, 3 insertions(+), 3 deletions(-)
>  delete mode 100644 tests/qapi-schema/redefined-builtin.err
>  create mode 100644 tests/qapi-schema/redefined-predefined.err
>  rename tests/qapi-schema/{redefined-builtin.json => redefined-predefined.json} (100%)
>  rename tests/qapi-schema/{redefined-builtin.out => redefined-predefined.out} (100%)
> 

Reviewed-by: Eric Blake <eblake@redhat.com>

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org