Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C95E4C2D0E4 for ; Tue, 24 Nov 2020 15:19:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E9CD2206D5 for ; Tue, 24 Nov 2020 15:19:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="hM1RTEe9" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9CD2206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46610 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kha6T-0002pS-Ul for qemu-devel@archiver.kernel.org; Tue, 24 Nov 2020 10:19:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kha4I-0001mt-Ev for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:17:22 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:54556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kha4D-0006ZG-GZ for qemu-devel@nongnu.org; Tue, 24 Nov 2020 10:17:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606231036; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=IqIvkKk1aP15RXoMM4iuWvWkVUz+0/8PIyZo5AnggRc=; b=hM1RTEe90LKPIH4bpKtBgtf+c0a5tO1sBjayAj30QNriDj1jK+MEPy25Dk/YhQx8DRzcmu hiz5AG9nb/XI2H73xZdbofUa2BNJqj3Fh5sjlH88KlP3eOOLyz3pRmgr8Z66FaiHCPANDL 3TZ4mK47E19gRoWaoTilMeYTdnUpqH8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-369-g5leptZFMFCMDtsV5JcqRg-1; Tue, 24 Nov 2020 10:17:14 -0500 X-MC-Unique: g5leptZFMFCMDtsV5JcqRg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60C7A801AE4 for ; Tue, 24 Nov 2020 15:17:13 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 30476189B4; Tue, 24 Nov 2020 15:17:10 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id B6B80113864E; Tue, 24 Nov 2020 16:17:08 +0100 (CET) From: Markus Armbruster To: Eduardo Habkost Subject: Re: [PATCH v3 08/19] qlit: Move qlit_equal_qobject() reference values to array References: <20201123194818.2773508-1-ehabkost@redhat.com> <20201123194818.2773508-9-ehabkost@redhat.com> <87360zozfd.fsf@dusky.pond.sub.org> <20201124144756.GN2271382@habkost.net> Date: Tue, 24 Nov 2020 16:17:08 +0100 In-Reply-To: <20201124144756.GN2271382@habkost.net> (Eduardo Habkost's message of "Tue, 24 Nov 2020 09:47:56 -0500") Message-ID: <87blfmhjij.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , "Daniel P. =?utf-8?Q?Berrang?= =?utf-8?Q?=C3=A9?=" , qemu-devel@nongnu.org, =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Eduardo Habkost writes: > On Tue, Nov 24, 2020 at 10:51:34AM +0100, Markus Armbruster wrote: >> Eduardo Habkost writes: >> >> > Add an array of values to qlit_equal_qobject_test(), so we can >> > extend the test case to compare multiple literals, not just the >> > ones at the existing `qlit` and `qlit_foo` variables. >> > >> > Signed-off-by: Eduardo Habkost >> > --- >> > This is a new patch added in v3 of this series. >> > --- >> > tests/check-qlit.c | 26 +++++++++++++++++++------- >> > 1 file changed, 19 insertions(+), 7 deletions(-) >> > >> > diff --git a/tests/check-qlit.c b/tests/check-qlit.c >> > index 24ac21395c..b1cfbddb17 100644 >> > --- a/tests/check-qlit.c >> > +++ b/tests/check-qlit.c >> > @@ -29,11 +29,6 @@ static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) { >> > { }, >> > })); >> > >> > -static QLitObject qlit_foo = QLIT_QDICT(((QLitDictEntry[]) { >> > - { "foo", QLIT_QNUM_INT(42) }, >> > - { }, >> > -})); >> > - >> > static QObject *make_qobject(void) >> > { >> > QDict *qdict = qdict_new(); >> > @@ -53,16 +48,33 @@ static QObject *make_qobject(void) >> > >> > static void qlit_equal_qobject_test(void) >> > { >> > + /* Each entry in the values[] array should be different from the others */ >> > + QLitObject values[] = { >> > + qlit, >> > + QLIT_QDICT(((QLitDictEntry[]) { >> > + { "foo", QLIT_QNUM_INT(42) }, >> > + { }, >> > + })), >> > + }; >> > + int i; >> > QObject *qobj = make_qobject(); >> > >> > g_assert(qlit_equal_qobject(&qlit, qobj)); >> > >> > - g_assert(!qlit_equal_qobject(&qlit_foo, qobj)); >> > - >> > qdict_put(qobject_to(QDict, qobj), "bee", qlist_new()); >> > g_assert(!qlit_equal_qobject(&qlit, qobj)); >> > >> > qobject_unref(qobj); >> > + >> > + for (i = 0; i < ARRAY_SIZE(values); i++) { >> > + int j; >> >> I'd prefer to declare this one together with @i. >> >> > + QObject *o = qobject_from_qlit(&values[i]); >> >> Blank line, if you don't mind. > > I will surely do it if there's a v4, but I hope you don't make me > submit v4 just to change these. That would be a waste of your time and mine :) If we decide to take the patches through my tree, I can tweak this in my tree. If somebody else takes it, and prefers not to tweak, I can tweak on top if I care. > >> >> > + for (j = 0; j < ARRAY_SIZE(values); j++) { >> > + g_assert(qlit_equal_qobject(&values[j], o) == (i == j)); >> > + } >> > + qobject_unref(o); >> > + } >> > + >> > } >> > >> > static void qlit_equal_large_qnum_test(void)