diff options
| -rw-r--r-- | tests/Makefile | 6 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-empty.err (renamed from tests/qapi-schema/data-array-empty.err) | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-empty.exit (renamed from tests/qapi-schema/data-array-empty.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-empty.json (renamed from tests/qapi-schema/data-array-empty.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-empty.out (renamed from tests/qapi-schema/data-array-empty.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-unknown.err (renamed from tests/qapi-schema/data-array-unknown.err) | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-unknown.exit (renamed from tests/qapi-schema/data-array-unknown.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-unknown.json (renamed from tests/qapi-schema/data-array-unknown.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-array-unknown.out (renamed from tests/qapi-schema/data-array-unknown.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-int.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-int.exit (renamed from tests/qapi-schema/data-int.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-int.json (renamed from tests/qapi-schema/data-int.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-int.out (renamed from tests/qapi-schema/data-int.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array-bad.err (renamed from tests/qapi-schema/data-member-array-bad.err) | 2 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array-bad.exit (renamed from tests/qapi-schema/data-member-array-bad.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array-bad.json (renamed from tests/qapi-schema/data-member-array-bad.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array-bad.out (renamed from tests/qapi-schema/data-member-array-bad.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array.err (renamed from tests/qapi-schema/data-member-array.err) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array.exit (renamed from tests/qapi-schema/data-member-array.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array.json (renamed from tests/qapi-schema/data-member-array.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-array.out (renamed from tests/qapi-schema/data-member-array.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-unknown.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-unknown.exit (renamed from tests/qapi-schema/data-member-unknown.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-unknown.json (renamed from tests/qapi-schema/data-member-unknown.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-member-unknown.out (renamed from tests/qapi-schema/data-member-unknown.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-unknown.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/args-unknown.exit (renamed from tests/qapi-schema/data-unknown.exit) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-unknown.json (renamed from tests/qapi-schema/data-unknown.json) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/args-unknown.out (renamed from tests/qapi-schema/data-unknown.out) | 0 | ||||
| -rw-r--r-- | tests/qapi-schema/data-int.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/data-member-unknown.err | 1 | ||||
| -rw-r--r-- | tests/qapi-schema/data-unknown.err | 1 |
32 files changed, 9 insertions, 9 deletions
diff --git a/tests/Makefile b/tests/Makefile index 52711237ca..0d560c51aa 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 index f713f14893..cb7ed33b3f 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-array-empty.exit b/tests/qapi-schema/args-array-empty.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-array-empty.exit +++ b/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 index 652dcfb24a..652dcfb24a 100644 --- a/tests/qapi-schema/data-array-empty.json +++ b/tests/qapi-schema/args-array-empty.json diff --git a/tests/qapi-schema/data-array-empty.out b/tests/qapi-schema/args-array-empty.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-array-empty.out +++ b/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 index 8b731bbcc8..7834d11bc1 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-array-unknown.exit b/tests/qapi-schema/args-array-unknown.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-array-unknown.exit +++ b/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 index 6f3e883315..6f3e883315 100644 --- a/tests/qapi-schema/data-array-unknown.json +++ b/tests/qapi-schema/args-array-unknown.json diff --git a/tests/qapi-schema/data-array-unknown.out b/tests/qapi-schema/args-array-unknown.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-array-unknown.out +++ b/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 0000000000..dc1d2504ff --- /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-int.exit b/tests/qapi-schema/args-int.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-int.exit +++ b/tests/qapi-schema/args-int.exit diff --git a/tests/qapi-schema/data-int.json b/tests/qapi-schema/args-int.json index a334d92e8c..a334d92e8c 100644 --- a/tests/qapi-schema/data-int.json +++ b/tests/qapi-schema/args-int.json diff --git a/tests/qapi-schema/data-int.out b/tests/qapi-schema/args-int.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-int.out +++ b/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 index 2c072d5986..881b4d954f 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-member-array-bad.exit b/tests/qapi-schema/args-member-array-bad.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-member-array-bad.exit +++ b/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 index b2ff144ec6..b2ff144ec6 100644 --- a/tests/qapi-schema/data-member-array-bad.json +++ b/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 index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-member-array-bad.out +++ b/tests/qapi-schema/args-member-array-bad.out diff --git a/tests/qapi-schema/data-member-array.err b/tests/qapi-schema/args-member-array.err index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-member-array.err +++ b/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 index 573541ac97..573541ac97 100644 --- a/tests/qapi-schema/data-member-array.exit +++ b/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 index e6f7f5da13..e6f7f5da13 100644 --- a/tests/qapi-schema/data-member-array.json +++ b/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 index c39fa25484..c39fa25484 100644 --- a/tests/qapi-schema/data-member-array.out +++ b/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 0000000000..f6f82828ce --- /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-member-unknown.exit b/tests/qapi-schema/args-member-unknown.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-member-unknown.exit +++ b/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 index 342a41ec90..342a41ec90 100644 --- a/tests/qapi-schema/data-member-unknown.json +++ b/tests/qapi-schema/args-member-unknown.json diff --git a/tests/qapi-schema/data-member-unknown.out b/tests/qapi-schema/args-member-unknown.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-member-unknown.out +++ b/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 0000000000..4d91ec869f --- /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-unknown.exit b/tests/qapi-schema/args-unknown.exit index d00491fd7e..d00491fd7e 100644 --- a/tests/qapi-schema/data-unknown.exit +++ b/tests/qapi-schema/args-unknown.exit diff --git a/tests/qapi-schema/data-unknown.json b/tests/qapi-schema/args-unknown.json index 32aba43b3f..32aba43b3f 100644 --- a/tests/qapi-schema/data-unknown.json +++ b/tests/qapi-schema/args-unknown.json diff --git a/tests/qapi-schema/data-unknown.out b/tests/qapi-schema/args-unknown.out index e69de29bb2..e69de29bb2 100644 --- a/tests/qapi-schema/data-unknown.out +++ b/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 1a9b077c06..0000000000 --- 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 ab905db802..0000000000 --- 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 5b07277a95..0000000000 --- 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' |