aboutsummaryrefslogtreecommitdiff
path: root/tests/qapi-schema/alternate-conflict-string.err
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2015-05-04 09:05:13 -0600
committerMarkus Armbruster <armbru@redhat.com>2015-05-05 18:39:00 +0200
commitab916faddd16f0165e9cc2551f90699be8efde53 (patch)
treea1bb9e4b8cb26b9a76e67de714ce4d3ad1f9fd52 /tests/qapi-schema/alternate-conflict-string.err
parent7b1b98c420355ccea98d8bd55c9193ee6b7cef97 (diff)
qapi: Use 'alternate' to replace anonymous union
Previous patches have led up to the point where I create the new meta-type "'alternate':'Foo'". See the previous patches for documentation; I intentionally split as much work into earlier patches to minimize the size of this patch, but a lot of it is churn due to testsuite fallout after updating to the new type. Signed-off-by: Eric Blake <eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema/alternate-conflict-string.err')
-rw-r--r--tests/qapi-schema/alternate-conflict-string.err2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qapi-schema/alternate-conflict-string.err b/tests/qapi-schema/alternate-conflict-string.err
index 271ddcdec8..fc523b0879 100644
--- a/tests/qapi-schema/alternate-conflict-string.err
+++ b/tests/qapi-schema/alternate-conflict-string.err
@@ -1 +1 @@
-tests/qapi-schema/alternate-conflict-string.json:4: Anonymous union 'MyUnion' member 'two' can't be distinguished from member 'one'
+tests/qapi-schema/alternate-conflict-string.json:4: Alternate 'Alt' member 'two' can't be distinguished from member 'one'