From 04e0639d4e77b6d55491d396c8aa13929ee8ed9a Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 18 Nov 2015 01:52:58 -0700 Subject: 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: Eric Blake Message-Id: <1447836791-369-24-git-send-email-eblake@redhat.com> [Commit message tweaked] Signed-off-by: Markus Armbruster --- tests/qapi-schema/enum-max-member.err | 1 - tests/qapi-schema/enum-max-member.exit | 1 - tests/qapi-schema/enum-max-member.json | 3 --- tests/qapi-schema/enum-max-member.out | 0 tests/qapi-schema/event-max.err | 1 - tests/qapi-schema/event-max.exit | 1 - tests/qapi-schema/event-max.json | 2 -- tests/qapi-schema/event-max.out | 0 tests/qapi-schema/union-max.err | 1 - tests/qapi-schema/union-max.exit | 1 - tests/qapi-schema/union-max.json | 3 --- tests/qapi-schema/union-max.out | 0 12 files changed, 14 deletions(-) delete mode 100644 tests/qapi-schema/enum-max-member.err delete mode 100644 tests/qapi-schema/enum-max-member.exit delete mode 100644 tests/qapi-schema/enum-max-member.json delete mode 100644 tests/qapi-schema/enum-max-member.out delete mode 100644 tests/qapi-schema/event-max.err delete mode 100644 tests/qapi-schema/event-max.exit delete mode 100644 tests/qapi-schema/event-max.json delete mode 100644 tests/qapi-schema/event-max.out delete mode 100644 tests/qapi-schema/union-max.err delete mode 100644 tests/qapi-schema/union-max.exit delete mode 100644 tests/qapi-schema/union-max.json delete mode 100644 tests/qapi-schema/union-max.out (limited to 'tests/qapi-schema') diff --git a/tests/qapi-schema/enum-max-member.err b/tests/qapi-schema/enum-max-member.err deleted file mode 100644 index f77837fb45..0000000000 --- a/tests/qapi-schema/enum-max-member.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/enum-max-member.json:3: Enum 'MyEnum' member 'max' clashes with '(automatic)' diff --git a/tests/qapi-schema/enum-max-member.exit b/tests/qapi-schema/enum-max-member.exit deleted file mode 100644 index d00491fd7e..0000000000 --- a/tests/qapi-schema/enum-max-member.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/qapi-schema/enum-max-member.json b/tests/qapi-schema/enum-max-member.json deleted file mode 100644 index 4bcda0bf07..0000000000 --- a/tests/qapi-schema/enum-max-member.json +++ /dev/null @@ -1,3 +0,0 @@ -# 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' ] } diff --git a/tests/qapi-schema/enum-max-member.out b/tests/qapi-schema/enum-max-member.out deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/qapi-schema/event-max.err b/tests/qapi-schema/event-max.err deleted file mode 100644 index c856534379..0000000000 --- a/tests/qapi-schema/event-max.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/event-max.json:2: Event name 'MAX' cannot be created diff --git a/tests/qapi-schema/event-max.exit b/tests/qapi-schema/event-max.exit deleted file mode 100644 index d00491fd7e..0000000000 --- a/tests/qapi-schema/event-max.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/qapi-schema/event-max.json b/tests/qapi-schema/event-max.json deleted file mode 100644 index f3d7de2a30..0000000000 --- a/tests/qapi-schema/event-max.json +++ /dev/null @@ -1,2 +0,0 @@ -# an event named 'MAX' would conflict with implicit C enum -{ 'event': 'MAX' } diff --git a/tests/qapi-schema/event-max.out b/tests/qapi-schema/event-max.out deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/qapi-schema/union-max.err b/tests/qapi-schema/union-max.err deleted file mode 100644 index 55ce4399d6..0000000000 --- a/tests/qapi-schema/union-max.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/union-max.json:2: Union 'Union' member 'max' clashes with '(automatic)' diff --git a/tests/qapi-schema/union-max.exit b/tests/qapi-schema/union-max.exit deleted file mode 100644 index d00491fd7e..0000000000 --- a/tests/qapi-schema/union-max.exit +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/tests/qapi-schema/union-max.json b/tests/qapi-schema/union-max.json deleted file mode 100644 index d6ad986999..0000000000 --- a/tests/qapi-schema/union-max.json +++ /dev/null @@ -1,3 +0,0 @@ -# we reject 'max' branch in a union, for collision with C enum -{ 'union': 'Union', - 'data': { 'max': 'int' } } diff --git a/tests/qapi-schema/union-max.out b/tests/qapi-schema/union-max.out deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3