From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 5/9] tests/qapi-schema: Consistently name string tests string-FOO
Date: Wed, 28 Aug 2019 22:26:37 +0200 [thread overview]
Message-ID: <20190828202641.24752-6-armbru@redhat.com> (raw)
In-Reply-To: <20190828202641.24752-1-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
.../{unclosed-string.json => string-unclosed.json} | 0
tests/qapi-schema/{unicode-str.json => string-unicode.json} | 0
tests/Makefile.include | 4 ++--
tests/qapi-schema/string-unclosed.err | 1 +
.../{unclosed-string.exit => string-unclosed.exit} | 0
.../qapi-schema/{unclosed-string.out => string-unclosed.out} | 0
tests/qapi-schema/string-unicode.err | 1 +
tests/qapi-schema/{unicode-str.exit => string-unicode.exit} | 0
tests/qapi-schema/{unicode-str.out => string-unicode.out} | 0
tests/qapi-schema/unclosed-string.err | 1 -
tests/qapi-schema/unicode-str.err | 1 -
11 files changed, 4 insertions(+), 4 deletions(-)
rename tests/qapi-schema/{unclosed-string.json => string-unclosed.json} (100%)
rename tests/qapi-schema/{unicode-str.json => string-unicode.json} (100%)
create mode 100644 tests/qapi-schema/string-unclosed.err
rename tests/qapi-schema/{unclosed-string.exit => string-unclosed.exit} (100%)
rename tests/qapi-schema/{unclosed-string.out => string-unclosed.out} (100%)
create mode 100644 tests/qapi-schema/string-unicode.err
rename tests/qapi-schema/{unicode-str.exit => string-unicode.exit} (100%)
rename tests/qapi-schema/{unicode-str.out => string-unicode.out} (100%)
delete mode 100644 tests/qapi-schema/unclosed-string.err
delete mode 100644 tests/qapi-schema/unicode-str.err
diff --git a/tests/qapi-schema/unclosed-string.json b/tests/qapi-schema/string-unclosed.json
similarity index 100%
rename from tests/qapi-schema/unclosed-string.json
rename to tests/qapi-schema/string-unclosed.json
diff --git a/tests/qapi-schema/unicode-str.json b/tests/qapi-schema/string-unicode.json
similarity index 100%
rename from tests/qapi-schema/unicode-str.json
rename to tests/qapi-schema/string-unicode.json
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 543bac6f93..af1baca936 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -453,6 +453,8 @@ qapi-schema += returns-dict.json
qapi-schema += returns-unknown.json
qapi-schema += returns-whitelist.json
qapi-schema += string-control.json
+qapi-schema += string-unclosed.json
+qapi-schema += string-unicode.json
qapi-schema += struct-base-clash-deep.json
qapi-schema += struct-base-clash.json
qapi-schema += struct-data-invalid.json
@@ -463,8 +465,6 @@ qapi-schema += trailing-comma-object.json
qapi-schema += type-bypass-bad-gen.json
qapi-schema += unclosed-list.json
qapi-schema += unclosed-object.json
-qapi-schema += unclosed-string.json
-qapi-schema += unicode-str.json
qapi-schema += union-base-empty.json
qapi-schema += union-base-no-discriminator.json
qapi-schema += union-branch-case.json
diff --git a/tests/qapi-schema/string-unclosed.err b/tests/qapi-schema/string-unclosed.err
new file mode 100644
index 0000000000..bc6c00a0ec
--- /dev/null
+++ b/tests/qapi-schema/string-unclosed.err
@@ -0,0 +1 @@
+tests/qapi-schema/string-unclosed.json:1:11: Missing terminating "'"
diff --git a/tests/qapi-schema/unclosed-string.exit b/tests/qapi-schema/string-unclosed.exit
similarity index 100%
rename from tests/qapi-schema/unclosed-string.exit
rename to tests/qapi-schema/string-unclosed.exit
diff --git a/tests/qapi-schema/unclosed-string.out b/tests/qapi-schema/string-unclosed.out
similarity index 100%
rename from tests/qapi-schema/unclosed-string.out
rename to tests/qapi-schema/string-unclosed.out
diff --git a/tests/qapi-schema/string-unicode.err b/tests/qapi-schema/string-unicode.err
new file mode 100644
index 0000000000..9a1bb0bc22
--- /dev/null
+++ b/tests/qapi-schema/string-unicode.err
@@ -0,0 +1 @@
+tests/qapi-schema/string-unicode.json:2: 'command' uses invalid name 'é'
diff --git a/tests/qapi-schema/unicode-str.exit b/tests/qapi-schema/string-unicode.exit
similarity index 100%
rename from tests/qapi-schema/unicode-str.exit
rename to tests/qapi-schema/string-unicode.exit
diff --git a/tests/qapi-schema/unicode-str.out b/tests/qapi-schema/string-unicode.out
similarity index 100%
rename from tests/qapi-schema/unicode-str.out
rename to tests/qapi-schema/string-unicode.out
diff --git a/tests/qapi-schema/unclosed-string.err b/tests/qapi-schema/unclosed-string.err
deleted file mode 100644
index 12b187074e..0000000000
--- a/tests/qapi-schema/unclosed-string.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unclosed-string.json:1:11: Missing terminating "'"
diff --git a/tests/qapi-schema/unicode-str.err b/tests/qapi-schema/unicode-str.err
deleted file mode 100644
index f621cd6448..0000000000
--- a/tests/qapi-schema/unicode-str.err
+++ /dev/null
@@ -1 +0,0 @@
-tests/qapi-schema/unicode-str.json:2: 'command' uses invalid name 'é'
--
2.21.0
next prev parent reply other threads:[~2019-08-28 20:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-28 20:26 [Qemu-devel] [PATCH 0/9] qapi: Schema language cleanups & doc improvements Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 1/9] qapi: Drop check_type()'s redundant parameter @allow_optional Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 2/9] qapi: Drop support for boxed alternate for commands, events Markus Armbruster
2019-08-30 12:44 ` Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 3/9] docs/devel/qapi-code-gen: Minor specification fixes Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 4/9] qapi: Outlaw control characters in strings Markus Armbruster
2019-08-28 20:26 ` Markus Armbruster [this message]
2019-08-28 20:26 ` [Qemu-devel] [PATCH 6/9] docs/devel/qapi-code-gen: Reorder sections for readability Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 7/9] docs/devel/qapi-code-gen: Rewrite compatibility considerations Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 8/9] docs/devel/qapi-code-gen: Rewrite introduction to schema Markus Armbruster
2019-08-28 20:26 ` [Qemu-devel] [PATCH 9/9] docs/devel/qapi-code-gen: Improve QAPI schema language doc Markus Armbruster
2019-08-28 21:42 ` [Qemu-devel] [PATCH 0/9] qapi: Schema language cleanups & doc improvements no-reply
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=20190828202641.24752-6-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).