From nobody Sun May 19 09:42:12 2024 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 1553006562326896.4798115350773; Tue, 19 Mar 2019 07:42:42 -0700 (PDT) Received: from localhost ([127.0.0.1]:58363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Fws-0003Km-Ak for importer@patchew.org; Tue, 19 Mar 2019 10:42:38 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6Frs-0007qI-IN for qemu-devel@nongnu.org; Tue, 19 Mar 2019 10:37:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6FiC-0003oY-UJ for qemu-devel@nongnu.org; Tue, 19 Mar 2019 10:27:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44023) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6FiB-0003mL-RR; Tue, 19 Mar 2019 10:27:28 -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 05F3330842AB; Tue, 19 Mar 2019 14:17:56 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-53.brq.redhat.com [10.40.204.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id B5B365C219; Tue, 19 Mar 2019 14:17:54 +0000 (UTC) From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= To: ldoktor@redhat.com, qemu-block@nongnu.org, kwolf@redhat.com, mreitz@redhat.com Date: Tue, 19 Mar 2019 15:17:26 +0100 Message-Id: <20190319141726.4830-1-ldoktor@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.40]); Tue, 19 Mar 2019 14:17:56 +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] [PATCH] 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: qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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": {"dri= ver": "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": {"dri= ver": "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 --- tests/qemu-iotests/051 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051 index 6a3b7c2b89..4430fba5fd 100755 --- a/tests/qemu-iotests/051 +++ b/tests/qemu-iotests/051 @@ -358,9 +358,9 @@ TMPDIR=3D/nonexistent run_qemu -drive driver=3Dnull-co,= snapshot=3Don =20 # Using snapshot=3Don together with read-only=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' + run_qemu -drive file=3D"$TEST_IMG",snapshot=3Don,read-only=3Don,if=3Dn= one,id=3D$device_id | tee /tmp/bbb | + _filter_qemu_io | tee /tmp/aaa | + sed -e 's#"[^"]*/vl\.[A-Za-z0-9]\{6\}"#SNAPSHOT_PATH#g' =20 =20 # success, all done --=20 2.20.1