From nobody Thu Dec 18 17:51:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553010592500707.9170745249992; Tue, 19 Mar 2019 08:49:52 -0700 (PDT) Received: from localhost ([127.0.0.1]:59203 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Gzo-00085d-CJ for importer@patchew.org; Tue, 19 Mar 2019 11:49:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Gx9-0006Wb-Sl for qemu-devel@nongnu.org; Tue, 19 Mar 2019 11:47:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6Gx7-0005FS-PC for qemu-devel@nongnu.org; Tue, 19 Mar 2019 11:46:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38130) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6Gx3-00055C-Nz; Tue, 19 Mar 2019 11:46:54 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 9254F30833C2; Tue, 19 Mar 2019 15:46:52 +0000 (UTC) Received: from dhcp-200-226.str.redhat.com (dhcp-200-226.str.redhat.com [10.33.200.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C7E35C1A1; Tue, 19 Mar 2019 15:46:50 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 19 Mar 2019 16:46:20 +0100 Message-Id: <20190319154620.23991-13-kwolf@redhat.com> In-Reply-To: <20190319154620.23991-1-kwolf@redhat.com> References: <20190319154620.23991-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Tue, 19 Mar 2019 15:46:52 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/12] qemu-iotests: Treat custom TEST_DIR in 051 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Content-Type: text/plain; charset="utf-8" From: Luk=C3=A1=C5=A1 Doktor When custom TEST_DIR is specified the output includes it without leading '/': $ TEST_DIR=3D/var/tmp ./check -file -qcow2 051 .... -drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"driver": "file", "filename": SNAPSHOT_PATH}} (qcow2, read-only) +drive0 (NODE_NAME): json:{"backing": {"driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/t.qcow2"}}, "driver": "qcow2", "file": {"driver": "file", "filename": "TEST_DIR/vl.ziHfeP"}} (qcow2, read-only) Let's remove it from the sed regexp. Signed-off-by: Luk=C3=A1=C5=A1 Doktor Signed-off-by: Kevin Wolf --- tests/qemu-iotests/051 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 6a3b7c2b89..02ac960da4 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -360,7 +360,7 @@ TMPDIR=3D/nonexistent run_qemu -drive driver=3Dnull-co,= snapshot=3Don echo "info block" | run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,read-only=3Don,if=3Dn= one,id=3D$device_id | _filter_qemu_io | - sed -e 's#"/[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' + sed -e 's#"[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' =20 =20 # success, all done --=20 2.20.1