diff options
| -rw-r--r-- | tests/Makefile.include | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/double-data.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/double-data.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/double-data.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/double-data.out | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/duplicate-key.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/include-format-err.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/include-format-err.exit | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/include-format-err.json | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/include-format-err.out | 0 |
10 files changed, 1 insertions, 11 deletions
diff --git a/tests/Makefile.include b/tests/Makefile.include index 089cc3ea95..0c862dbc42 100644 --- 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 deleted file mode 100644 index cc765c4ff2..0000000000 --- a/tests/qapi-schema/double-data.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/double-data.json:2:41: Duplicate key "data" diff --git a/tests/qapi-schema/double-data.exit b/tests/qapi-schema/double-data.exit deleted file mode 100644 index d00491fd7e..0000000000 --- a/tests/qapi-schema/double-data.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/qapi-schema/double-data.json b/tests/qapi-schema/double-data.json deleted file mode 100644 index e76b519538..0000000000 --- a/tests/qapi-schema/double-data.json +++ /dev/null @@ -1,2 +0,0 @@ -# we reject an expression with duplicate top-level keys -{ 'struct': 'bar', 'data': { }, 'data': { 'string': 'str'} } diff --git a/tests/qapi-schema/double-data.out b/tests/qapi-schema/double-data.out deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/qapi-schema/double-data.out +++ /dev/null diff --git a/tests/qapi-schema/duplicate-key.json b/tests/qapi-schema/duplicate-key.json index 14ac0e8a40..06b55840c9 100644 --- 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 deleted file mode 100644 index 721ff4eccc..0000000000 --- a/tests/qapi-schema/include-format-err.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/include-format-err.json:1: Invalid 'include' directive diff --git a/tests/qapi-schema/include-format-err.exit b/tests/qapi-schema/include-format-err.exit deleted file mode 100644 index d00491fd7e..0000000000 --- a/tests/qapi-schema/include-format-err.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/qapi-schema/include-format-err.json b/tests/qapi-schema/include-format-err.json deleted file mode 100644 index 44980f026f..0000000000 --- a/tests/qapi-schema/include-format-err.json +++ /dev/null @@ -1,2 +0,0 @@ -{ 'include': 'include-simple-sub.json', - 'foo': 'bar' } diff --git a/tests/qapi-schema/include-format-err.out b/tests/qapi-schema/include-format-err.out deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/qapi-schema/include-format-err.out +++ /dev/null |