From patchwork Fri Nov 4 13:16:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9412619 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A104E60722 for ; Fri, 4 Nov 2016 13:16:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 982622AFD5 for ; Fri, 4 Nov 2016 13:16:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8D0202B063; Fri, 4 Nov 2016 13:16:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1F9C72AFD5 for ; Fri, 4 Nov 2016 13:16:54 +0000 (UTC) Received: from localhost ([::1]:38709 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2eMX-0000v8-1M for patchwork-qemu-devel@patchwork.kernel.org; Fri, 04 Nov 2016 09:16:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37386) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c2eMG-0000v3-LU for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:16:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c2eMB-0005U3-KX for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:16:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51294) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c2eMB-0005TM-FE for qemu-devel@nongnu.org; Fri, 04 Nov 2016 09:16:31 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C78D731B320; Fri, 4 Nov 2016 13:16:30 +0000 (UTC) Received: from red.redhat.com (ovpn-116-51.phx2.redhat.com [10.3.116.51]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA4DGUpO004174; Fri, 4 Nov 2016 09:16:30 -0400 From: Eric Blake To: qemu-devel@nongnu.org Date: Fri, 4 Nov 2016 08:16:24 -0500 Message-Id: <1478265384-20309-1-git-send-email-eblake@redhat.com> In-Reply-To: <1477516718-15439-3-git-send-email-eblake@redhat.com> References: <1477516718-15439-3-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 04 Nov 2016 13:16:30 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 3.5/3] fixup! tests: Enhance qobject output to cover partial visit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Michael Roth Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP [adds comments. No commit body change] Signed-off-by: Eric Blake --- tests/test-qobject-output-visitor.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c index fdae0d5..7646bb4 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -260,10 +260,12 @@ static void test_visitor_out_partial_visit(TestOutputVisitorData *data, /* Various checks that a mid-visit abort doesn't leak or double-free. */ const char *str = "hi"; Error *err = NULL; - UserDefAlternate uda = { .type = QTYPE_QDICT, - .u.udfu = { .integer = 1, - .string = (char *) "bye", - .enum1 = -1 } }; + UserDefAlternate uda = { + .type = QTYPE_QDICT, + .u.udfu = { .integer = 1, + .string = (char *) "bye", + .enum1 = -1 } /* intentionally bad */ + }; UserDefAlternate *obj = &uda; /* Abort within a nested object with no data members */ @@ -286,6 +288,7 @@ static void test_visitor_out_partial_visit(TestOutputVisitorData *data, visit_type_UserDefUnionBase_members(data->ov, (UserDefUnionBase *)&uda.u.udfu, &err); + /* error expected because of bad "enum1" discriminator value */ error_free_or_abort(&err); visitor_reset(data); }