From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH v2 18/26] tests/qapi-schema: Rename tests from data- to args-
Date: Fri, 28 Aug 2015 18:45:58 +0200 [thread overview]
Message-ID: <1440780366-7177-19-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1440780366-7177-1-git-send-email-armbru@redhat.com>
Since every schema entity has 'data', the data- prefix conveys no
information. These tests actually exercise commands. Only commands
have arguments, so change the prefix to to args-.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
tests/Makefile | 6 +++---
tests/qapi-schema/{data-array-empty.err => args-array-empty.err} | 2 +-
tests/qapi-schema/{data-unknown.exit => args-array-empty.exit} | 0
tests/qapi-schema/{data-array-empty.json => args-array-empty.json} | 0
tests/qapi-schema/{data-unknown.out => args-array-empty.out} | 0
.../qapi-schema/{data-array-unknown.err => args-array-unknown.err} | 2 +-
.../{data-member-unknown.exit => args-array-unknown.exit} | 0
.../{data-array-unknown.json => args-array-unknown.json} | 0
.../qapi-schema/{data-member-unknown.out => args-array-unknown.out} | 0
tests/qapi-schema/args-int.err | 1 +
tests/qapi-schema/{data-member-array-bad.exit => args-int.exit} | 0
tests/qapi-schema/{data-int.json => args-int.json} | 0
tests/qapi-schema/{data-member-array.err => args-int.out} | 0
.../{data-member-array-bad.err => args-member-array-bad.err} | 2 +-
tests/qapi-schema/{data-int.exit => args-member-array-bad.exit} | 0
.../{data-member-array-bad.json => args-member-array-bad.json} | 0
.../{data-member-array-bad.out => args-member-array-bad.out} | 0
tests/qapi-schema/{data-int.out => args-member-array.err} | 0
.../qapi-schema/{data-member-array.exit => args-member-array.exit} | 0
.../qapi-schema/{data-member-array.json => args-member-array.json} | 0
tests/qapi-schema/{data-member-array.out => args-member-array.out} | 0
tests/qapi-schema/args-member-unknown.err | 1 +
.../{data-array-unknown.exit => args-member-unknown.exit} | 0
.../{data-member-unknown.json => args-member-unknown.json} | 0
.../qapi-schema/{data-array-unknown.out => args-member-unknown.out} | 0
tests/qapi-schema/args-unknown.err | 1 +
tests/qapi-schema/{data-array-empty.exit => args-unknown.exit} | 0
tests/qapi-schema/{data-unknown.json => args-unknown.json} | 0
tests/qapi-schema/{data-array-empty.out => args-unknown.out} | 0
tests/qapi-schema/data-int.err | 1 -
tests/qapi-schema/data-member-unknown.err | 1 -
tests/qapi-schema/data-unknown.err | 1 -
32 files changed, 9 insertions(+), 9 deletions(-)
rename tests/qapi-schema/{data-array-empty.err => args-array-empty.err} (50%)
rename tests/qapi-schema/{data-unknown.exit => args-array-empty.exit} (100%)
rename tests/qapi-schema/{data-array-empty.json => args-array-empty.json} (100%)
rename tests/qapi-schema/{data-unknown.out => args-array-empty.out} (100%)
rename tests/qapi-schema/{data-array-unknown.err => args-array-unknown.err} (50%)
rename tests/qapi-schema/{data-member-unknown.exit => args-array-unknown.exit} (100%)
rename tests/qapi-schema/{data-array-unknown.json => args-array-unknown.json} (100%)
rename tests/qapi-schema/{data-member-unknown.out => args-array-unknown.out} (100%)
create mode 100644 tests/qapi-schema/args-int.err
rename tests/qapi-schema/{data-member-array-bad.exit => args-int.exit} (100%)
rename tests/qapi-schema/{data-int.json => args-int.json} (100%)
rename tests/qapi-schema/{data-member-array.err => args-int.out} (100%)
rename tests/qapi-schema/{data-member-array-bad.err => args-member-array-bad.err} (52%)
rename tests/qapi-schema/{data-int.exit => args-member-array-bad.exit} (100%)
rename tests/qapi-schema/{data-member-array-bad.json => args-member-array-bad.json} (100%)
rename tests/qapi-schema/{data-member-array-bad.out => args-member-array-bad.out} (100%)
rename tests/qapi-schema/{data-int.out => args-member-array.err} (100%)
rename tests/qapi-schema/{data-member-array.exit => args-member-array.exit} (100%)
rename tests/qapi-schema/{data-member-array.json => args-member-array.json} (100%)
rename tests/qapi-schema/{data-member-array.out => args-member-array.out} (100%)
create mode 100644 tests/qapi-schema/args-member-unknown.err
rename tests/qapi-schema/{data-array-unknown.exit => args-member-unknown.exit} (100%)
rename tests/qapi-schema/{data-member-unknown.json => args-member-unknown.json} (100%)
rename tests/qapi-schema/{data-array-unknown.out => args-member-unknown.out} (100%)
create mode 100644 tests/qapi-schema/args-unknown.err
rename tests/qapi-schema/{data-array-empty.exit => args-unknown.exit} (100%)
rename tests/qapi-schema/{data-unknown.json => args-unknown.json} (100%)
rename tests/qapi-schema/{data-array-empty.out => args-unknown.out} (100%)
delete mode 100644 tests/qapi-schema/data-int.err
delete mode 100644 tests/qapi-schema/data-member-unknown.err
delete mode 100644 tests/qapi-schema/data-unknown.err
diff --git a/tests/Makefile b/tests/Makefile
index 5271123..0d560c5 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -229,9 +229,9 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
redefined-type.json redefined-command.json redefined-builtin.json \
redefined-event.json command-int.json bad-data.json event-max.json \
type-bypass.json type-bypass-no-gen.json type-bypass-bad-gen.json \
- data-array-empty.json data-array-unknown.json data-int.json \
- data-unknown.json data-member-unknown.json data-member-array.json \
- data-member-array-bad.json returns-array-bad.json returns-int.json \
+ args-array-empty.json args-array-unknown.json args-int.json \
+ args-unknown.json args-member-unknown.json args-member-array.json \
+ args-member-array-bad.json returns-array-bad.json returns-int.json \
returns-unknown.json returns-alternate.json returns-whitelist.json \
missing-colon.json missing-comma-list.json missing-comma-object.json \
nested-struct-data.json nested-struct-returns.json non-objects.json \
diff --git a/tests/qapi-schema/data-array-empty.err b/tests/qapi-schema/args-array-empty.err
similarity index 50%
rename from tests/qapi-schema/data-array-empty.err
rename to tests/qapi-schema/args-array-empty.err
index f713f14..cb7ed33 100644
--- a/tests/qapi-schema/data-array-empty.err
+++ b/tests/qapi-schema/args-array-empty.err
@@ -1 +1 @@
-tests/qapi-schema/data-array-empty.json:2: Member 'empty' of 'data' for command 'oops': array type must contain single type name
+tests/qapi-schema/args-array-empty.json:2: Member 'empty' of 'data' for command 'oops': array type must contain single type name
diff --git a/tests/qapi-schema/data-unknown.exit b/tests/qapi-schema/args-array-empty.exit
similarity index 100%
rename from tests/qapi-schema/data-unknown.exit
rename to tests/qapi-schema/args-array-empty.exit
diff --git a/tests/qapi-schema/data-array-empty.json b/tests/qapi-schema/args-array-empty.json
similarity index 100%
rename from tests/qapi-schema/data-array-empty.json
rename to tests/qapi-schema/args-array-empty.json
diff --git a/tests/qapi-schema/data-unknown.out b/tests/qapi-schema/args-array-empty.out
similarity index 100%
rename from tests/qapi-schema/data-unknown.out
rename to tests/qapi-schema/args-array-empty.out
diff --git a/tests/qapi-schema/data-array-unknown.err b/tests/qapi-schema/args-array-unknown.err
similarity index 50%
rename from tests/qapi-schema/data-array-unknown.err
rename to tests/qapi-schema/args-array-unknown.err
index 8b731bb..7834d11 100644
--- a/tests/qapi-schema/data-array-unknown.err
+++ b/tests/qapi-schema/args-array-unknown.err
@@ -1 +1 @@
-tests/qapi-schema/data-array-unknown.json:2: Member 'array' of 'data' for command 'oops' uses unknown type 'array of NoSuchType'
+tests/qapi-schema/args-array-unknown.json:2: Member 'array' of 'data' for command 'oops' uses unknown type 'array of NoSuchType'
diff --git a/tests/qapi-schema/data-member-unknown.exit b/tests/qapi-schema/args-array-unknown.exit
similarity index 100%
rename from tests/qapi-schema/data-member-unknown.exit
rename to tests/qapi-schema/args-array-unknown.exit
diff --git a/tests/qapi-schema/data-array-unknown.json b/tests/qapi-schema/args-array-unknown.json
similarity index 100%
rename from tests/qapi-schema/data-array-unknown.json
rename to tests/qapi-schema/args-array-unknown.json
diff --git a/tests/qapi-schema/data-member-unknown.out b/tests/qapi-schema/args-array-unknown.out
similarity index 100%
rename from tests/qapi-schema/data-member-unknown.out
rename to tests/qapi-schema/args-array-unknown.out
diff --git a/tests/qapi-schema/args-int.err b/tests/qapi-schema/args-int.err
new file mode 100644
index 0000000..dc1d250
--- /dev/null
+++ b/tests/qapi-schema/args-int.err
@@ -0,0 +1 @@
+tests/qapi-schema/args-int.json:2: 'data' for command 'oops' cannot use built-in type 'int'
diff --git a/tests/qapi-schema/data-member-array-bad.exit b/tests/qapi-schema/args-int.exit
similarity index 100%
rename from tests/qapi-schema/data-member-array-bad.exit
rename to tests/qapi-schema/args-int.exit
diff --git a/tests/qapi-schema/data-int.json b/tests/qapi-schema/args-int.json
similarity index 100%
rename from tests/qapi-schema/data-int.json
rename to tests/qapi-schema/args-int.json
diff --git a/tests/qapi-schema/data-member-array.err b/tests/qapi-schema/args-int.out
similarity index 100%
rename from tests/qapi-schema/data-member-array.err
rename to tests/qapi-schema/args-int.out
diff --git a/tests/qapi-schema/data-member-array-bad.err b/tests/qapi-schema/args-member-array-bad.err
similarity index 52%
rename from tests/qapi-schema/data-member-array-bad.err
rename to tests/qapi-schema/args-member-array-bad.err
index 2c072d5..881b4d9 100644
--- a/tests/qapi-schema/data-member-array-bad.err
+++ b/tests/qapi-schema/args-member-array-bad.err
@@ -1 +1 @@
-tests/qapi-schema/data-member-array-bad.json:2: Member 'member' of 'data' for command 'oops': array type must contain single type name
+tests/qapi-schema/args-member-array-bad.json:2: Member 'member' of 'data' for command 'oops': array type must contain single type name
diff --git a/tests/qapi-schema/data-int.exit b/tests/qapi-schema/args-member-array-bad.exit
similarity index 100%
rename from tests/qapi-schema/data-int.exit
rename to tests/qapi-schema/args-member-array-bad.exit
diff --git a/tests/qapi-schema/data-member-array-bad.json b/tests/qapi-schema/args-member-array-bad.json
similarity index 100%
rename from tests/qapi-schema/data-member-array-bad.json
rename to tests/qapi-schema/args-member-array-bad.json
diff --git a/tests/qapi-schema/data-member-array-bad.out b/tests/qapi-schema/args-member-array-bad.out
similarity index 100%
rename from tests/qapi-schema/data-member-array-bad.out
rename to tests/qapi-schema/args-member-array-bad.out
diff --git a/tests/qapi-schema/data-int.out b/tests/qapi-schema/args-member-array.err
similarity index 100%
rename from tests/qapi-schema/data-int.out
rename to tests/qapi-schema/args-member-array.err
diff --git a/tests/qapi-schema/data-member-array.exit b/tests/qapi-schema/args-member-array.exit
similarity index 100%
rename from tests/qapi-schema/data-member-array.exit
rename to tests/qapi-schema/args-member-array.exit
diff --git a/tests/qapi-schema/data-member-array.json b/tests/qapi-schema/args-member-array.json
similarity index 100%
rename from tests/qapi-schema/data-member-array.json
rename to tests/qapi-schema/args-member-array.json
diff --git a/tests/qapi-schema/data-member-array.out b/tests/qapi-schema/args-member-array.out
similarity index 100%
rename from tests/qapi-schema/data-member-array.out
rename to tests/qapi-schema/args-member-array.out
diff --git a/tests/qapi-schema/args-member-unknown.err b/tests/qapi-schema/args-member-unknown.err
new file mode 100644
index 0000000..f6f8282
--- /dev/null
+++ b/tests/qapi-schema/args-member-unknown.err
@@ -0,0 +1 @@
+tests/qapi-schema/args-member-unknown.json:2: Member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/tests/qapi-schema/data-array-unknown.exit b/tests/qapi-schema/args-member-unknown.exit
similarity index 100%
rename from tests/qapi-schema/data-array-unknown.exit
rename to tests/qapi-schema/args-member-unknown.exit
diff --git a/tests/qapi-schema/data-member-unknown.json b/tests/qapi-schema/args-member-unknown.json
similarity index 100%
rename from tests/qapi-schema/data-member-unknown.json
rename to tests/qapi-schema/args-member-unknown.json
diff --git a/tests/qapi-schema/data-array-unknown.out b/tests/qapi-schema/args-member-unknown.out
similarity index 100%
rename from tests/qapi-schema/data-array-unknown.out
rename to tests/qapi-schema/args-member-unknown.out
diff --git a/tests/qapi-schema/args-unknown.err b/tests/qapi-schema/args-unknown.err
new file mode 100644
index 0000000..4d91ec8
--- /dev/null
+++ b/tests/qapi-schema/args-unknown.err
@@ -0,0 +1 @@
+tests/qapi-schema/args-unknown.json:2: 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/tests/qapi-schema/data-array-empty.exit b/tests/qapi-schema/args-unknown.exit
similarity index 100%
rename from tests/qapi-schema/data-array-empty.exit
rename to tests/qapi-schema/args-unknown.exit
diff --git a/tests/qapi-schema/data-unknown.json b/tests/qapi-schema/args-unknown.json
similarity index 100%
rename from tests/qapi-schema/data-unknown.json
rename to tests/qapi-schema/args-unknown.json
diff --git a/tests/qapi-schema/data-array-empty.out b/tests/qapi-schema/args-unknown.out
similarity index 100%
rename from tests/qapi-schema/data-array-empty.out
rename to tests/qapi-schema/args-unknown.out
diff --git a/tests/qapi-schema/data-int.err b/tests/qapi-schema/data-int.err
deleted file mode 100644
index 1a9b077..0000000
--- a/tests/qapi-schema/data-int.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/data-int.json:2: 'data' for command 'oops' cannot use built-in type 'int'
diff --git a/tests/qapi-schema/data-member-unknown.err b/tests/qapi-schema/data-member-unknown.err
deleted file mode 100644
index ab905db..0000000
--- a/tests/qapi-schema/data-member-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/data-member-unknown.json:2: Member 'member' of 'data' for command 'oops' uses unknown type 'NoSuchType'
diff --git a/tests/qapi-schema/data-unknown.err b/tests/qapi-schema/data-unknown.err
deleted file mode 100644
index 5b07277..0000000
--- a/tests/qapi-schema/data-unknown.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/data-unknown.json:2: 'data' for command 'oops' uses unknown type 'NoSuchType'
--
2.4.3
next prev parent reply other threads:[~2015-08-28 16:46 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-28 16:45 [Qemu-devel] [PATCH v2 00/26] qapi: Another round of fixes and cleanups Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 01/26] qapi: Clarify docs on including the same file multiple times Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 02/26] qapi: Clean up cgen() and mcgen() Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 03/26] qapi: Simplify guardname() Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 04/26] qapi-event: Clean up how name of enum QAPIEvent is made Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 05/26] qapi: Reject -p arguments that break qapi-event.py Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 06/26] qapi: Drop unused and useless parameters and variables Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 07/26] qapi: Fix generated code when flat union has member 'kind' Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 08/26] qapi: Generate a nicer struct for flat unions Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 09/26] qapi-visit: Fix generated code when schema has forward refs Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 10/26] qapi-visit: Replace list implicit_structs by set Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed to visitors Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 12/26] tests/qapi-schema: Document alternate's enum lacks visit function Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 13/26] tests/qapi-schema: Document events with base don't work Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 14/26] qapi: Document that input visitor semantics are prone to leaks Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 15/26] qapi: Document shortcoming with union 'data' branch Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 16/26] qapi: Document flaws in checking of names Markus Armbruster
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 17/26] tests/qapi-schema: Restore test case for flat union base bug Markus Armbruster
2015-08-28 16:45 ` Markus Armbruster [this message]
2015-08-28 16:45 ` [Qemu-devel] [PATCH v2 19/26] qapi-tests: New tests for union, alternate command arguments Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 20/26] qapi: Fix to reject union command and event arguments Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 21/26] qapi: Command returning anonymous type doesn't work, outlaw Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 22/26] qapi-commands: Fix gen_err_check(e) for e and e != 'local_err' Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 23/26] qapi-commands: Inline gen_marshal_output_call() Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 24/26] qapi-commands: Don't feed output of mcgen() to mcgen() again Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 25/26] qapi-commands: Drop useless initialization Markus Armbruster
2015-08-28 16:46 ` [Qemu-devel] [PATCH v2 26/26] qapi: Generated code cleanup Markus Armbruster
2015-08-31 15:55 ` [Qemu-devel] [PATCH 27/31] qapi: Drop one of two "simple union must not have base" checks Markus Armbruster
2015-08-31 16:05 ` Eric Blake
2015-08-31 15:55 ` [Qemu-devel] [PATCH 28/31] tests/qapi-schema: Cover two more syntax errors Markus Armbruster
2015-08-31 16:09 ` Eric Blake
2015-08-31 15:55 ` [Qemu-devel] [PATCH 29/31] tests/qapi-schema: Cover non-string, non-dictionary members Markus Armbruster
2015-08-31 16:13 ` Eric Blake
2015-08-31 15:55 ` [Qemu-devel] [PATCH 30/31] qapi: Fix errors for " Markus Armbruster
2015-08-31 16:19 ` Eric Blake
2015-08-31 15:55 ` [Qemu-devel] [PATCH 31/31] qapi: Simplify error reporting for array types Markus Armbruster
2015-08-31 16:28 ` Eric Blake
2015-08-31 16:28 ` [Qemu-devel] [PATCH v2 00/26] qapi: Another round of fixes and cleanups Markus Armbruster
2015-09-03 9:59 ` Markus Armbruster
2015-09-03 9:55 ` [Qemu-devel] [PATCH 32/33] docs/qapi-code-gen.txt: Fix QAPI schema examples Markus Armbruster
2015-09-03 14:32 ` Eric Blake
2015-09-03 9:55 ` [Qemu-devel] [PATCH 33/33] qapi: Generators crash when --output-dir isn't given, fix Markus Armbruster
2015-09-03 14:32 ` Eric Blake
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1440780366-7177-19-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mdroth@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).