From nobody Sun Apr 13 00:54:36 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613401641; cv=none; d=zohomail.com; s=zohoarc; b=CYvFySH88b3NIZDVlFae95DOpuoDne3SRt5EEsP5unrrB5ggZLvXFJ+d6f80kmjiTHLIer637Ut99Nt+8Y+0KSzmoEzecXkLzl3VFQjld/iHCaNDMcdat6E4gtzosHyrdir1uyzZRheY5uSE7GHKr1czevYxqweexhgErX8xfUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613401641; 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=4FOfO4A5XEOQp5RAsrSabrfua3b8RE1+jXQbZLO2Uvc=; b=aeCdIU51lP5+k8g0DtcHnBmQ286MfABm+pGvjdQAMhaHD+vil6Yo4Q6BvgJM5frDJCzEnmf/uXamlHoNsPPaUllb1IUK/UR/sztZmVJ9pn4Y8NoPlUZwNedsxoE9HT2xbhx/o8g2pmAmxeSh90xuaCR63+Xz4zF6mKiqJnJd7/k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 161340164064591.15732771929811; Mon, 15 Feb 2021 07:07:20 -0800 (PST) Received: from localhost ([::1]:45904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lBfT5-0001tJ-D8 for importer@patchew.org; Mon, 15 Feb 2021 10:07:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lBfNM-0005dn-Aq for qemu-devel@nongnu.org; Mon, 15 Feb 2021 10:01:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lBfNJ-0000mB-Mz for qemu-devel@nongnu.org; Mon, 15 Feb 2021 10:01:24 -0500 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-598-yl___hIuPku68CRRMUc3mQ-1; Mon, 15 Feb 2021 10:01:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7DCF48710ED; Mon, 15 Feb 2021 15:01:06 +0000 (UTC) Received: from merkur.fritz.box (ovpn-113-28.ams2.redhat.com [10.36.113.28]) by smtp.corp.redhat.com (Postfix) with ESMTP id 85ED05C241; Mon, 15 Feb 2021 15:01:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613401281; 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=4FOfO4A5XEOQp5RAsrSabrfua3b8RE1+jXQbZLO2Uvc=; b=L4BgpLZdPvt7iO7PnDVTmu9FXl05NISc7K3e6W6sW+yJZF/H9EVjwSuFDYnHEzkVAUrdlE wiVpTaSlet7/GlCZcN7mBsOe9LQ76WbJBqV/RzgSrZ/xCvqn9wtUnU+uujAYSOnyjG9LJc 8jgkJbcOM073HyI3BJQtyK8lFTDtBc0= X-MC-Unique: yl___hIuPku68CRRMUc3mQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 02/11] iotests: Consistent $IMGOPTS boundary matching Date: Mon, 15 Feb 2021 16:00:51 +0100 Message-Id: <20210215150100.436555-3-kwolf@redhat.com> In-Reply-To: <20210215150100.436555-1-kwolf@redhat.com> References: <20210215150100.436555-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com 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=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, RCVD_IN_MSPIKE_H4=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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Max Reitz To disallow certain refcount_bits values, some _unsupported_imgopts invocations look like "refcount_bits=3D1[^0-9]", i.e. they match an integer boundary with [^0-9]. This expression does not match the end of the string, though, so it breaks down when refcount_bits is the last option (which it tends to be after the rewrite of the check script in Python). Those invocations could use \b or \> instead, but those are not portable. They could use something like \([^0-9]\|$\), but that would be cumbersome. To make it simple and keep the existing invocations working, just let _unsupported_imgopts match the regex against $IMGOPTS plus a trailing space. Suggested-by: Eric Blake Signed-off-by: Max Reitz Message-Id: <20210210095128.22732-1-mreitz@redhat.com> Reviewed-by: Eric Blake Signed-off-by: Kevin Wolf --- tests/qemu-iotests/common.rc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 77c37e8312..65cdba5723 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -885,7 +885,9 @@ _unsupported_imgopts() { for bad_opt do - if echo "$IMGOPTS" | grep -q 2>/dev/null "$bad_opt" + # Add a space so tests can match for whitespace that marks the + # end of an option (\b or \> are not portable) + if echo "$IMGOPTS " | grep -q 2>/dev/null "$bad_opt" then _notrun "not suitable for image option: $bad_opt" fi --=20 2.29.2