[Qemu-devel] [PATCH 5/9] tests/qapi-schema: Consistently name string tests string-FOO

[Markus Armbruster]

Signed-off-by: Markus Armbruster <address@hidden>
---
 .../{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