From nobody Sat May 18 21:15:54 2024 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=1612950833; cv=none; d=zohomail.com; s=zohoarc; b=DJm/c4YX6bAYlIqgxFNasF5JWhCj+tnHCGIKo+vb5wTU76bea4woekMPWzjmwCRVumyCusmkTGS2EUUo4JLpASD9LZtXtKkOetAurRUzgSlYHwmEfIGyLDkihTD2v/Rrt3NJDAjWjiFAMuIRloEcREYEJpgq4QJZ1Hj7sYme7fA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612950833; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=eENynDJNps9kDCIJFPnyq/XCtSPyPmheRK5nRG4nsSE=; b=nxu2VIvsg8Sx8p8vVqOwnei4EKxqxwWUpj12Xl0GNV8qUiwCY7/m2GJM/+slMRKEDK5qsCw8UZ14RuzxtSNCA0DBNoB31PwJIUqaOZOfYsN4QzO375P+33FcwAU2fgPZyEtfTwIr8SdDp0h1yGoLUD78Mlc5W2P0VAqxZgpVfZ0= 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 1612950833115674.1299603074588; Wed, 10 Feb 2021 01:53:53 -0800 (PST) Received: from localhost ([::1]:40552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9mC0-0002wB-2s for importer@patchew.org; Wed, 10 Feb 2021 04:53:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l9m9p-0000ee-Sr for qemu-devel@nongnu.org; Wed, 10 Feb 2021 04:51:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51435) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9m9m-0001Vq-H2 for qemu-devel@nongnu.org; Wed, 10 Feb 2021 04:51:36 -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-69-czISM5FXN4WpngEoPoVZVg-1; Wed, 10 Feb 2021 04:51:31 -0500 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 54F29193578B; Wed, 10 Feb 2021 09:51:30 +0000 (UTC) Received: from localhost (ovpn-114-231.ams2.redhat.com [10.36.114.231]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E786B5D9CD; Wed, 10 Feb 2021 09:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612950692; 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; bh=eENynDJNps9kDCIJFPnyq/XCtSPyPmheRK5nRG4nsSE=; b=AM4jfRKZEgcdYqIJFuTBKeAR9i0tN1CV1F7amf/+WEa3EFNKd67rvH00CJX6fYdiZ7J2cA b8N7eA3qiA8hcmIZ6UK9P9kNxlVWtw1Li0M3fivWdXy8f6nDJ1iCE22a5KbmMWKkC11D8E KjTEAFVtcXOpviWYyW8Cd617DcjGyTg= X-MC-Unique: czISM5FXN4WpngEoPoVZVg-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH] iotests: Consistent $IMGOPTS boundary matching Date: Wed, 10 Feb 2021 10:51:28 +0100 Message-Id: <20210210095128.22732-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@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=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.57, 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_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: Kevin Wolf , qemu-devel@nongnu.org, Max Reitz 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" 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 Reviewed-by: Eric Blake --- Supersedes "iotests: Fix unsupported_imgopts for refcount_bits", and can be reproduced in the same way: $ ./check -qcow2 -o refcount_bits=3D1 7 15 29 58 62 66 68 80 (those tests should be skipped) --- 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