From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmdKN-00021z-8U for qemu-devel@nongnu.org; Thu, 15 Oct 2015 03:51:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmdKI-0002PX-4C for qemu-devel@nongnu.org; Thu, 15 Oct 2015 03:51:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43917) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmdKH-0002PJ-V7 for qemu-devel@nongnu.org; Thu, 15 Oct 2015 03:51:50 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 395BA319B44 for ; Thu, 15 Oct 2015 07:51:49 +0000 (UTC) From: Markus Armbruster Date: Thu, 15 Oct 2015 09:51:37 +0200 Message-Id: <1444895505-16067-5-git-send-email-armbru@redhat.com> In-Reply-To: <1444895505-16067-1-git-send-email-armbru@redhat.com> References: <1444895505-16067-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 04/12] qapi: Drop redundant alternate-good test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org From: Eric Blake The alternate-good.json test was already covered by qapi-schema-test.json. As future commits will be tweaking how alternates are laid out, removing the duplicate test now reduces churn. Signed-off-by: Eric Blake Message-Id: <1444710158-8723-4-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster --- tests/Makefile | 1 - tests/qapi-schema/alternate-good.err | 0 tests/qapi-schema/alternate-good.exit | 1 - tests/qapi-schema/alternate-good.json | 9 --------- tests/qapi-schema/alternate-good.out | 10 ---------- 5 files changed, 21 deletions(-) delete mode 100644 tests/qapi-schema/alternate-good.err delete mode 100644 tests/qapi-schema/alternate-good.exit delete mode 100644 tests/qapi-schema/alternate-good.json delete mode 100644 tests/qapi-schema/alternate-good.out diff --git a/tests/Makefile b/tests/Makefile index 209eca9..9a6601d 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -230,7 +230,6 @@ qapi-schema += alternate-clash.json qapi-schema += alternate-conflict-dict.json qapi-schema += alternate-conflict-string.json qapi-schema += alternate-empty.json -qapi-schema += alternate-good.json qapi-schema += alternate-nested.json qapi-schema += alternate-unknown.json qapi-schema += args-alternate.json diff --git a/tests/qapi-schema/alternate-good.err b/tests/qapi-schema/alternate-good.err deleted file mode 100644 index e69de29..0000000 diff --git a/tests/qapi-schema/alternate-good.exit b/tests/qapi-schema/alternate-good.exit deleted file mode 100644 index 573541a..0000000 --- a/tests/qapi-schema/alternate-good.exit +++ /dev/null @@ -1 +0,0 @@ -0 diff --git a/tests/qapi-schema/alternate-good.json b/tests/qapi-schema/alternate-good.json deleted file mode 100644 index 3371770..0000000 --- a/tests/qapi-schema/alternate-good.json +++ /dev/null @@ -1,9 +0,0 @@ -# Working example of alternate -{ 'struct': 'Data', - 'data': { '*number': 'int', '*name': 'str' } } -{ 'enum': 'Enum', - 'data': [ 'hello', 'world' ] } -{ 'alternate': 'Alt', - 'data': { 'value': 'int', - 'string': 'Enum', - 'struct': 'Data' } } diff --git a/tests/qapi-schema/alternate-good.out b/tests/qapi-schema/alternate-good.out deleted file mode 100644 index 65af727..0000000 --- a/tests/qapi-schema/alternate-good.out +++ /dev/null @@ -1,10 +0,0 @@ -object :empty -alternate Alt - case value: int - case string: Enum - case struct: Data -enum AltKind ['value', 'string', 'struct'] -object Data - member number: int optional=True - member name: str optional=True -enum Enum ['hello', 'world'] -- 2.4.3