Commit f8c4fdd6 authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Markus Armbruster
Browse files

tests/qapi: Cover commands with 'if' and union / alternate 'data' 



Forgotten in commit 967c8851.

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20181208111606.8505-19-marcandre.lureau@redhat.com>
Message-Id: <20181208111606.8505-21-marcandre.lureau@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
[Squashed, commit message adjusted]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 00382fa8

tests/qapi-schema/qapi-schema-test.json

+6 −0
Original line number Diff line number Diff line
@@ -210,9 +210,15 @@ 
{ 'union': 'TestIfUnion', 'data': { 'foo': 'TestStruct' },

  'if': 'defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)' }



{ 'command': 'TestIfUnionCmd', 'data': { 'union_cmd_arg': 'TestIfUnion' },

  'if': 'defined(TEST_IF_UNION)' }



{ 'alternate': 'TestIfAlternate', 'data': { 'foo': 'int', 'bar': 'TestStruct' },

  'if': 'defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)' }



{ 'command': 'TestIfAlternateCmd', 'data': { 'alt_cmd_arg': 'TestIfAlternate' },

  'if': 'defined(TEST_IF_ALT)' }



{ 'command': 'TestIfCmd', 'data': { 'foo': 'TestIfStruct' },

  'returns': 'UserDefThree',

  'if': ['defined(TEST_IF_CMD)', 'defined(TEST_IF_STRUCT)'] }

tests/qapi-schema/qapi-schema-test.out

+12 −0
Original line number Diff line number Diff line
@@ -251,11 +251,23 @@ object TestIfUnion 
    tag type

    case foo: q_obj_TestStruct-wrapper

    if ['defined(TEST_IF_UNION) && defined(TEST_IF_STRUCT)']

object q_obj_TestIfUnionCmd-arg

    member union_cmd_arg: TestIfUnion optional=False

    if ['defined(TEST_IF_UNION)']

command TestIfUnionCmd q_obj_TestIfUnionCmd-arg -> None

   gen=True success_response=True boxed=False oob=False preconfig=False

    if ['defined(TEST_IF_UNION)']

alternate TestIfAlternate

    tag type

    case foo: int

    case bar: TestStruct

    if ['defined(TEST_IF_ALT) && defined(TEST_IF_STRUCT)']

object q_obj_TestIfAlternateCmd-arg

    member alt_cmd_arg: TestIfAlternate optional=False

    if ['defined(TEST_IF_ALT)']

command TestIfAlternateCmd q_obj_TestIfAlternateCmd-arg -> None

   gen=True success_response=True boxed=False oob=False preconfig=False

    if ['defined(TEST_IF_ALT)']

object q_obj_TestIfCmd-arg

    member foo: TestIfStruct optional=False

    if ['defined(TEST_IF_CMD)', 'defined(TEST_IF_STRUCT)']