From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C8C4EC74A5B for ; Fri, 17 Mar 2023 06:11:42 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pd3J3-0002Uz-Bk; Fri, 17 Mar 2023 02:11:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pd3J0-0002Sy-VQ for qemu-devel@nongnu.org; Fri, 17 Mar 2023 02:11:10 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pd3Ix-0004gq-FK for qemu-devel@nongnu.org; Fri, 17 Mar 2023 02:11:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1679033465; 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=fliOw977ZLR48g5GTxJyLwEMC6SeTTRHFxscp0FxIW8=; b=Uri957vZ2OVF/5uHjdWBAy2fKdVFmXpYjp6jwAOjrnN/E4WjyL4hh+2wL6KJYtewORG/t+ c7SWgYxJ0ywZXXWjgB1cT1dSgR9JSSVwmAkrm5hfolgHdEgPQeufP2dg7uhNt+nuYEJE7C StbmylZb9Vyoyd7/D843bKK/TlAYQP4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-417-EfZokbQwOnyO5ZIQtcj5Aw-1; Fri, 17 Mar 2023 02:10:54 -0400 X-MC-Unique: EfZokbQwOnyO5ZIQtcj5Aw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A2472811E7D; Fri, 17 Mar 2023 06:10:53 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.52]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CA062166B26; Fri, 17 Mar 2023 06:10:53 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4C57621E6806; Fri, 17 Mar 2023 07:10:52 +0100 (CET) From: Markus Armbruster To: Eric Blake Cc: qemu-devel@nongnu.org, michael.roth@amd.com, marcandre.lureau@redhat.com, berrange@redhat.com, jsnow@redhat.com Subject: Re: [PATCH 11/14] tests/qapi-schema: Clean up positive test for conditionals References: <20230316071325.492471-1-armbru@redhat.com> <20230316071325.492471-12-armbru@redhat.com> <20230317010950.6oxwhloomaup4m2l@redhat.com> Date: Fri, 17 Mar 2023 07:10:52 +0100 In-Reply-To: <20230317010950.6oxwhloomaup4m2l@redhat.com> (Eric Blake's message of "Thu, 16 Mar 2023 20:09:50 -0500") Message-ID: <87jzzfoqkz.fsf@pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Eric Blake writes: > On Thu, Mar 16, 2023 at 08:13:22AM +0100, Markus Armbruster wrote: >> Union TestIfUnion is conditional on macros TEST_IF_UNION and >> TEST_IF_STRUCT. It uses TestIfEnum, which is conditional on macro >> TEST_IF_ENUM. If TEST_IF_ENUM and TEST_IF_STRUCT are defined, but >> TEST_IF_ENUM isn't, the generated code won't compile. > > s/ENUM/UNION/ in one of these two uses in this sentence. Yes: If TEST_IF_UNION and TEST_IF_UNION are defined, ... >> Command test-if-cmd is conditional an macros TEST_IF_CMD and >> TEST_IF_STRUCT, and uses TestIfEnum. Similar issue. >> >> Event TEST_IF_EVENT is conditional an macros TEST_IF_EVT and >> TEST_IF_STRUCT, and uses TestIfEnum. Similar issue. >> >> Replace the uses of TestIfEnum in the latter two by str. >> >> TestIfUnion is now TestIfEnum's only user. Change TestIfEnum's >> condition to TEST_IF_UNION. > > Fair enough, once the commit message doesn't confuse me in the first > paragraph ;) > >> >> Signed-off-by: Markus Armbruster >> --- >> tests/qapi-schema/qapi-schema-test.json | 6 +++--- >> tests/qapi-schema/qapi-schema-test.out | 8 +++----- >> 2 files changed, 6 insertions(+), 8 deletions(-) >> > > Reviewed-by: Eric Blake Thanks!