tests/qapi-schema: Delete two redundant tests

Tests duplicate-key and double-data test the same thing. The former predates the latter, and it has a better name. Delete the latter, and tweak the former's comment. Tests include-format-err and include-extra-junk test the same thing. The former predates the latter, but the latter has a better name and a comment. Delete the former. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190914153506.2151-3-armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
qemu · Sep 24, 2019 · 352ada9 · 352ada9
1 parent 137cf6a
commit 352ada9
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 11 deletions.
diff --git a/tests/Makefile.include b/tests/Makefile.include
@@ -359,7 +359,6 @@ qapi-schema += doc-missing-expr.json
 qapi-schema += doc-missing-space.json
 qapi-schema += doc-missing.json
 qapi-schema += doc-no-symbol.json
-qapi-schema += double-data.json
 qapi-schema += double-type.json
 qapi-schema += duplicate-key.json
 qapi-schema += empty.json
@@ -404,7 +403,6 @@ qapi-schema += ident-with-escape.json
 qapi-schema += include-before-err.json
 qapi-schema += include-cycle.json
 qapi-schema += include-extra-junk.json
-qapi-schema += include-format-err.json
 qapi-schema += include-nested-err.json
 qapi-schema += include-no-file.json
 qapi-schema += include-non-file.json

diff --git a/tests/qapi-schema/double-data.err b/tests/qapi-schema/double-data.err
diff --git a/tests/qapi-schema/double-data.exit b/tests/qapi-schema/double-data.exit
diff --git a/tests/qapi-schema/double-data.json b/tests/qapi-schema/double-data.json
diff --git a/tests/qapi-schema/double-data.out b/tests/qapi-schema/double-data.out
diff --git a/tests/qapi-schema/duplicate-key.json b/tests/qapi-schema/duplicate-key.json
@@ -1,3 +1,3 @@
-# QAPI cannot include the same key more than once in any {}
+# Cannot include the same key more than once in any {}
 { 'key': 'value',
   'key': 'value' }
diff --git a/tests/qapi-schema/include-format-err.err b/tests/qapi-schema/include-format-err.err
diff --git a/tests/qapi-schema/include-format-err.exit b/tests/qapi-schema/include-format-err.exit
diff --git a/tests/qapi-schema/include-format-err.json b/tests/qapi-schema/include-format-err.json
diff --git a/tests/qapi-schema/include-format-err.out b/tests/qapi-schema/include-format-err.out