From patchwork Sun Oct 4 03:41:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 526060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5EE0B1402B4 for ; Sun, 4 Oct 2015 14:46:57 +1100 (AEDT) Received: from localhost ([::1]:41025 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZiaGD-0007Oj-H3 for incoming@patchwork.ozlabs.org; Sat, 03 Oct 2015 23:46:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39417) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZiaB1-00073f-DL for qemu-devel@nongnu.org; Sat, 03 Oct 2015 23:41:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZiaAy-0002C5-6K for qemu-devel@nongnu.org; Sat, 03 Oct 2015 23:41:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47728) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZiaAx-0002Bw-W7 for qemu-devel@nongnu.org; Sat, 03 Oct 2015 23:41:28 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id ADB6492488; Sun, 4 Oct 2015 03:41:27 +0000 (UTC) Received: from red.redhat.com ([10.3.113.8]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t943fHKI018032; Sat, 3 Oct 2015 23:41:27 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Sat, 3 Oct 2015 21:41:12 -0600 Message-Id: <1443930073-19359-14-git-send-email-eblake@redhat.com> In-Reply-To: <1443930073-19359-1-git-send-email-eblake@redhat.com> References: <1443930073-19359-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Michael Roth , marcandre.lureau@redhat.com, armbru@redhat.com, ehabkost@redhat.com Subject: [Qemu-devel] [PATCH v7 13/14] qapi: Add test for alternate branch 'kind' clash X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Rename alternate-clash to alternate-clash-members, and add a new test alternate-clash-type. While similar to the earlier addition of union-clash-type, we have one major difference: a future patch will be simplifying alternates to not need an implict AlternateKind enum, but we still need to detect the collision with the resulting C 'qtype_code type;' tag. No change to generated code. Signed-off-by: Eric Blake --- v7: retitle 10/12 and limit to just testsuite changes v6: New patch --- tests/Makefile | 3 ++- tests/qapi-schema/alternate-clash-members.err | 1 + .../{alternate-clash.exit => alternate-clash-members.exit} | 0 .../{alternate-clash.json => alternate-clash-members.json} | 0 .../{alternate-clash.out => alternate-clash-members.out} | 0 tests/qapi-schema/alternate-clash-type.err | 1 + tests/qapi-schema/alternate-clash-type.exit | 1 + tests/qapi-schema/alternate-clash-type.json | 10 ++++++++++ tests/qapi-schema/alternate-clash-type.out | 0 tests/qapi-schema/alternate-clash.err | 1 - 10 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 tests/qapi-schema/alternate-clash-members.err rename tests/qapi-schema/{alternate-clash.exit => alternate-clash-members.exit} (100%) rename tests/qapi-schema/{alternate-clash.json => alternate-clash-members.json} (100%) rename tests/qapi-schema/{alternate-clash.out => alternate-clash-members.out} (100%) create mode 100644 tests/qapi-schema/alternate-clash-type.err create mode 100644 tests/qapi-schema/alternate-clash-type.exit create mode 100644 tests/qapi-schema/alternate-clash-type.json create mode 100644 tests/qapi-schema/alternate-clash-type.out delete mode 100644 tests/qapi-schema/alternate-clash.err diff --git a/tests/Makefile b/tests/Makefile index b85ce48..b721a18 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -223,7 +223,8 @@ $(foreach target,$(SYSEMU_TARGET_LIST), \ qapi-schema += alternate-array.json qapi-schema += alternate-base.json -qapi-schema += alternate-clash.json +qapi-schema += alternate-clash-members.json +qapi-schema += alternate-clash-type.json qapi-schema += alternate-conflict-dict.json qapi-schema += alternate-conflict-string.json qapi-schema += alternate-empty.json diff --git a/tests/qapi-schema/alternate-clash-members.err b/tests/qapi-schema/alternate-clash-members.err new file mode 100644 index 0000000..0adf737 --- /dev/null +++ b/tests/qapi-schema/alternate-clash-members.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-clash-members.json:7: Alternate 'Alt1' branch 'a_b' clashes with 'a-b' diff --git a/tests/qapi-schema/alternate-clash.exit b/tests/qapi-schema/alternate-clash-members.exit similarity index 100% rename from tests/qapi-schema/alternate-clash.exit rename to tests/qapi-schema/alternate-clash-members.exit diff --git a/tests/qapi-schema/alternate-clash.json b/tests/qapi-schema/alternate-clash-members.json similarity index 100% rename from tests/qapi-schema/alternate-clash.json rename to tests/qapi-schema/alternate-clash-members.json diff --git a/tests/qapi-schema/alternate-clash.out b/tests/qapi-schema/alternate-clash-members.out similarity index 100% rename from tests/qapi-schema/alternate-clash.out rename to tests/qapi-schema/alternate-clash-members.out diff --git a/tests/qapi-schema/alternate-clash-type.err b/tests/qapi-schema/alternate-clash-type.err new file mode 100644 index 0000000..cdd2090 --- /dev/null +++ b/tests/qapi-schema/alternate-clash-type.err @@ -0,0 +1 @@ +tests/qapi-schema/alternate-clash-type.json:9: 'kind' (branch of Alt1) collides with 'kind' (implicit tag of Alt1) diff --git a/tests/qapi-schema/alternate-clash-type.exit b/tests/qapi-schema/alternate-clash-type.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/qapi-schema/alternate-clash-type.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/alternate-clash-type.json b/tests/qapi-schema/alternate-clash-type.json new file mode 100644 index 0000000..629584b --- /dev/null +++ b/tests/qapi-schema/alternate-clash-type.json @@ -0,0 +1,10 @@ +# Alternate branch 'type' +# Reject this, because we would have a clash in generated C, between the +# alternate's implicit tag member 'kind' and the branch name 'kind' +# within the alternate. +# TODO: Even if alternates are simplified in the future to use a simpler +# 'qtype_code type' tag, rather than a full QAPISchemaObjectTypeMember, +# we must still flag the collision, or else munge the generated C branch +# names to allow compilation. +{ 'alternate': 'Alt1', + 'data': { 'kind': 'str', 'type': 'int' } } diff --git a/tests/qapi-schema/alternate-clash-type.out b/tests/qapi-schema/alternate-clash-type.out new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/alternate-clash.err b/tests/qapi-schema/alternate-clash.err deleted file mode 100644 index 7fd3069..0000000 --- a/tests/qapi-schema/alternate-clash.err +++ /dev/null @@ -1 +0,0 @@ -tests/qapi-schema/alternate-clash.json:7: Alternate 'Alt1' branch 'a_b' clashes with 'a-b'