From e75d4225b76842ec899f25e8ff39b070119f033f Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 23 Mar 2021 10:40:22 +0100 Subject: tests/qapi-schema: Switch member name clash test to struct Test args-name-clash covers command parameter name clash. This effectively covers struct member name clash as well. The next commit will make parameter name clash impossible. Convert args-name-clash from testing command to testing a struct, and rename it to struct-member-name-clash. Signed-off-by: Markus Armbruster Message-Id: <20210323094025.3569441-26-armbru@redhat.com> Reviewed-by: Eric Blake [Commit message typo fixed] --- tests/qapi-schema/args-name-clash.err | 2 -- tests/qapi-schema/args-name-clash.json | 4 ---- tests/qapi-schema/args-name-clash.out | 0 tests/qapi-schema/meson.build | 2 +- tests/qapi-schema/struct-member-name-clash.err | 2 ++ tests/qapi-schema/struct-member-name-clash.json | 4 ++++ tests/qapi-schema/struct-member-name-clash.out | 0 7 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 tests/qapi-schema/args-name-clash.err delete mode 100644 tests/qapi-schema/args-name-clash.json delete mode 100644 tests/qapi-schema/args-name-clash.out create mode 100644 tests/qapi-schema/struct-member-name-clash.err create mode 100644 tests/qapi-schema/struct-member-name-clash.json create mode 100644 tests/qapi-schema/struct-member-name-clash.out (limited to 'tests/qapi-schema') diff --git a/tests/qapi-schema/args-name-clash.err b/tests/qapi-schema/args-name-clash.err deleted file mode 100644 index 3e04817..0000000 --- a/tests/qapi-schema/args-name-clash.err +++ /dev/null @@ -1,2 +0,0 @@ -args-name-clash.json: In command 'oops': -args-name-clash.json:4: parameter 'a_b' collides with parameter 'a-b' diff --git a/tests/qapi-schema/args-name-clash.json b/tests/qapi-schema/args-name-clash.json deleted file mode 100644 index 61423cb..0000000 --- a/tests/qapi-schema/args-name-clash.json +++ /dev/null @@ -1,4 +0,0 @@ -# C member name collision -# Reject members that clash when mapped to C names (we would have two 'a_b' -# members). -{ 'command': 'oops', 'data': { 'a-b': 'str', 'a_b': 'str' } } diff --git a/tests/qapi-schema/args-name-clash.out b/tests/qapi-schema/args-name-clash.out deleted file mode 100644 index e69de29..0000000 diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 4e7635f..8ba6917 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -30,7 +30,6 @@ schemas = [ 'args-member-array-bad.json', 'args-member-case.json', 'args-member-unknown.json', - 'args-name-clash.json', 'args-union.json', 'args-unknown.json', 'bad-base.json', @@ -177,6 +176,7 @@ schemas = [ 'struct-member-if-invalid.json', 'struct-member-invalid-dict.json', 'struct-member-invalid.json', + 'struct-member-name-clash.json', 'trailing-comma-list.json', 'trailing-comma-object.json', 'type-bypass-bad-gen.json', diff --git a/tests/qapi-schema/struct-member-name-clash.err b/tests/qapi-schema/struct-member-name-clash.err new file mode 100644 index 0000000..6ac042d --- /dev/null +++ b/tests/qapi-schema/struct-member-name-clash.err @@ -0,0 +1,2 @@ +struct-member-name-clash.json: In struct 'Oops': +struct-member-name-clash.json:4: member 'a_b' collides with member 'a-b' diff --git a/tests/qapi-schema/struct-member-name-clash.json b/tests/qapi-schema/struct-member-name-clash.json new file mode 100644 index 0000000..3fb69cc --- /dev/null +++ b/tests/qapi-schema/struct-member-name-clash.json @@ -0,0 +1,4 @@ +# C member name collision +# Reject members that clash when mapped to C names (we would have two 'a_b' +# members). +{ 'struct': 'Oops', 'data': { 'a-b': 'str', 'a_b': 'str' } } diff --git a/tests/qapi-schema/struct-member-name-clash.out b/tests/qapi-schema/struct-member-name-clash.out new file mode 100644 index 0000000..e69de29 -- cgit v1.1