Commit 04e0639d authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Remove obsolete tests for MAX collision 



Now that we no longer collide with an implicit _MAX enum member,
we no longer need to reject it in the ad hoc parser, and can
remove several tests that are no longer needed.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-24-git-send-email-eblake@redhat.com>
[Commit message tweaked]
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 7fb1cf16

scripts/qapi.py

+3 −5
Original line number Diff line number Diff line
@@ -537,8 +537,6 @@ def check_event(expr, expr_info): 
    global events

    name = expr['event']



    if name.upper() == 'MAX':

        raise QAPIExprError(expr_info, "Event name 'MAX' cannot be created")

    events.append(name)

    check_type(expr_info, "'data' for event '%s'" % name,

               expr.get('data'), allow_dict=True, allow_optional=True,
@@ -550,7 +548,7 @@ def check_union(expr, expr_info): 
    base = expr.get('base')

    discriminator = expr.get('discriminator')

    members = expr['data']

    values = {'MAX': '(automatic)'}

    values = {}



    # Two types of unions, determined by discriminator.
@@ -629,7 +627,7 @@ def check_union(expr, expr_info): 
def check_alternate(expr, expr_info):

    name = expr['alternate']

    members = expr['data']

    values = {'MAX': '(automatic)'}

    values = {}

    types_seen = {}



    # Check every branch
@@ -662,7 +660,7 @@ def check_enum(expr, expr_info): 
    name = expr['enum']

    members = expr.get('data')

    prefix = expr.get('prefix')

    values = {'MAX': '(automatic)'}

    values = {}



    if not isinstance(members, list):

        raise QAPIExprError(expr_info,

tests/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -267,14 +267,12 @@ qapi-schema += enum-bad-prefix.json 
qapi-schema += enum-clash-member.json

qapi-schema += enum-dict-member.json

qapi-schema += enum-int-member.json

qapi-schema += enum-max-member.json

qapi-schema += enum-missing-data.json

qapi-schema += enum-wrong-data.json

qapi-schema += escape-outside-string.json

qapi-schema += escape-too-big.json

qapi-schema += escape-too-short.json

qapi-schema += event-case.json

qapi-schema += event-max.json

qapi-schema += event-nest-struct.json

qapi-schema += flat-union-array-branch.json

qapi-schema += flat-union-bad-base.json
@@ -347,7 +345,6 @@ qapi-schema += union-clash-branches.json 
qapi-schema += union-clash-data.json

qapi-schema += union-empty.json

qapi-schema += union-invalid-base.json

qapi-schema += union-max.json

qapi-schema += union-optional-branch.json

qapi-schema += union-unknown.json

qapi-schema += unknown-escape.json

tests/qapi-schema/enum-max-member.err

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
tests/qapi-schema/enum-max-member.json:3: Enum 'MyEnum' member 'max' clashes with '(automatic)'

tests/qapi-schema/enum-max-member.exit

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
1

tests/qapi-schema/enum-max-member.json

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
# we reject user-supplied 'max' for clashing with implicit enum end

# TODO: should we instead munge the implicit value to avoid the clash?

{ 'enum': 'MyEnum', 'data': [ 'max' ] }