From patchwork Tue Jul 25 14:19:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 1812612 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=ZYlehlnD; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R9K1x68JHz1yXx for ; Wed, 26 Jul 2023 00:20:37 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOIsw-0001Ko-JV; Tue, 25 Jul 2023 10:19:34 -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 1qOIsv-0001Fo-6t for qemu-devel@nongnu.org; Tue, 25 Jul 2023 10:19:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qOIst-00016b-Mv for qemu-devel@nongnu.org; Tue, 25 Jul 2023 10:19:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1690294771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=iJKAOd73TU0GcgP6rc8gjaQYLMeZ5Sfi/EpNh/tTVI0=; b=ZYlehlnDx8M0gdZNDHdvkNZQL3lJu5XL5NoZbQOHExn5FOjTj54X0rE3fxOUyQVb7Do9Ef +SBriYT9waTK/imNhN3Ob0mWP83f27HKelo5rUwxrifmiRZyakaZp0+To/e1VD4+uuk9A+ +omD66IdjNPUxlJ1SJNA3Aj8Y0hnTdg= 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-76-Ro4fQ7ImMxCNTewHZLzAGg-1; Tue, 25 Jul 2023 10:19:29 -0400 X-MC-Unique: Ro4fQ7ImMxCNTewHZLzAGg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9958586F124; Tue, 25 Jul 2023 14:19:24 +0000 (UTC) Received: from localhost (unknown [10.39.192.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id 193224094DC1; Tue, 25 Jul 2023 14:19:23 +0000 (UTC) From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Stefan Hajnoczi , Hanna Reitz , Kevin Wolf Subject: [PATCH 3/7] iotests: string substitution order in _filter_img_create_filenames Date: Tue, 25 Jul 2023 10:19:11 -0400 Message-ID: <20230725141915.386364-4-stefanha@redhat.com> In-Reply-To: <20230725141915.386364-1-stefanha@redhat.com> References: <20230725141915.386364-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Received-SPF: pass client-ip=170.10.133.124; envelope-from=stefanha@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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org _filter_img_create_filenames fails to remove $IMGPROTO: when $REMOTE_TEST_DIR matches. echo "$IMGPROTO:$REMOTE_TEST_DIR" | _filter_img_create_filenames results in "$IMGPROTO:TEST_DIR" instead of "TEST_DIR". Substitute "s#$REMOTE_TEST_DIR#TEST_DIR#g" after "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" since the latter matches $TEST_DIR. This way echo "$IMGPROTO:$REMOTE_TEST_DIR" | _filter_img_create_filenames results in "TEST_DIR" as expected. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/common.filter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index fc3c64bcb8..4acac16c52 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -125,8 +125,8 @@ _filter_actual_image_size() _filter_img_create_filenames() { sed \ + -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \ - -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \ -e "s#$TEST_DIR#TEST_DIR#g" \ -e "s#$SOCK_DIR#SOCK_DIR#g" \ -e 's#SOCK_DIR/fuse-#TEST_DIR/#g' \