From nobody Mon Feb 9 08:57:04 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588145197; cv=none; d=zohomail.com; s=zohoarc; b=e3QY4ZfuR+E+KNmovU1ODOYVYG6J8uEik1PP0DAwlTc5OcYdC9gJzLyxBkUjoha7AbFHFfKlW6yd83zLsx+U23EJ0q5462gw8jM5hwVGD/zy1IbhB9uDCm2mCyuWv9iaRam1NS6Jsy1CrkhbsQN+9wxjBoDfoUYN35FBWXiyeuw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588145197; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vopO6icJU9oW0OXatkyCDGGFzRbzqNq0XdIne6fEN/A=; b=OEJjLOPtzNSiD1Fmo0YWpqtSqi5Ikh5iyRidKGzVpup7SSQbstILCGG4BUOIfBxpIeRfvru4r884pm/hoh9JV66SWGhoiw5s9lUiVFXGEKTsFMjwPjV7gWMPt2GAAUpK7aFYP40pfeGzN0En7BBOpqxzk5HMT9INYQfdWkTYbI0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588145197985273.09930777267834; Wed, 29 Apr 2020 00:26:37 -0700 (PDT) Received: from localhost ([::1]:40034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh76-0000BO-PH for importer@patchew.org; Wed, 29 Apr 2020 03:26:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jTh1u-0007td-Vh for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:22:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jTh1g-0003wA-8E for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:21:14 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:43451 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jTh1f-0003sS-PC for qemu-devel@nongnu.org; Wed, 29 Apr 2020 03:20:59 -0400 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-36-UGhf8HR7N0-yILQXflHapQ-1; Wed, 29 Apr 2020 03:20:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24894801503 for ; Wed, 29 Apr 2020 07:20:52 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E6E115D9E8; Wed, 29 Apr 2020 07:20:51 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D588C11358C2; Wed, 29 Apr 2020 09:20:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588144855; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vopO6icJU9oW0OXatkyCDGGFzRbzqNq0XdIne6fEN/A=; b=Q9T1yIIL8B0/qnjAi64X9SQyQ8qv5rElJ9xw70/rJC4ulw4YY+6jKJnkTkp7hftcC+2arI 9Dkgw0EZbIE9VVsHQSOoAtXZMoqTbqcVFl7OfMPbBuKJliYnKUAIoDHAhAq8HHl1XwMGx4 7m436YrVgHu44KR60k3cmMzKB0T03Gs= X-MC-Unique: UGhf8HR7N0-yILQXflHapQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 06/32] test-qemu-opts: Simplify test_has_help_option() after bug fix Date: Wed, 29 Apr 2020 09:20:22 +0200 Message-Id: <20200429072048.29963-7-armbru@redhat.com> In-Reply-To: <20200429072048.29963-1-armbru@redhat.com> References: <20200429072048.29963-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/29 00:53:13 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: Kevin Wolf Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Kevin Wolf Message-Id: <20200415074927.19897-6-armbru@redhat.com> --- tests/test-qemu-opts.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c index 77c944c4aa..2a0f42a09b 100644 --- a/tests/test-qemu-opts.c +++ b/tests/test-qemu-opts.c @@ -732,41 +732,39 @@ static void test_has_help_option(void) { static const struct { const char *params; - /* expected value of has_help_option() */ - bool expect_has_help_option; /* expected value of qemu_opt_has_help_opt() with implied=3Dfalse = */ - bool expect_opt_has_help_opt; + bool expect; /* expected value of qemu_opt_has_help_opt() with implied=3Dtrue */ - bool expect_opt_has_help_opt_implied; + bool expect_implied; } test[] =3D { - { "help", true, true, false }, - { "?", true, true, false }, - { "helpme", false, false, false }, - { "?me", false, false, false }, - { "a,help", true, true, true }, - { "a,?", true, true, true }, - { "a=3D0,help,b", true, true, true }, - { "a=3D0,?,b", true, true, true }, - { "help,b=3D1", true, true, false }, - { "?,b=3D1", true, true, false }, - { "a,b,,help", true, true, true }, - { "a,b,,?", true, true, true }, + { "help", true, false }, + { "?", true, false }, + { "helpme", false, false }, + { "?me", false, false }, + { "a,help", true, true }, + { "a,?", true, true }, + { "a=3D0,help,b", true, true }, + { "a=3D0,?,b", true, true }, + { "help,b=3D1", true, false }, + { "?,b=3D1", true, false }, + { "a,b,,help", true, true }, + { "a,b,,?", true, true }, }; int i; QemuOpts *opts; =20 for (i =3D 0; i < ARRAY_SIZE(test); i++) { g_assert_cmpint(has_help_option(test[i].params), - =3D=3D, test[i].expect_has_help_option); + =3D=3D, test[i].expect); opts =3D qemu_opts_parse(&opts_list_03, test[i].params, false, &error_abort); g_assert_cmpint(qemu_opt_has_help_opt(opts), - =3D=3D, test[i].expect_opt_has_help_opt); + =3D=3D, test[i].expect); qemu_opts_del(opts); opts =3D qemu_opts_parse(&opts_list_03, test[i].params, true, &error_abort); g_assert_cmpint(qemu_opt_has_help_opt(opts), - =3D=3D, test[i].expect_opt_has_help_opt_implied); + =3D=3D, test[i].expect_implied); qemu_opts_del(opts); } } --=20 2.21.1