From nobody Mon Feb 9 17:24:54 2026 Delivered-To: importer@patchew.org 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; 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=1576767073; cv=none; d=zohomail.com; s=zohoarc; b=eJ9rxmc3n1khsnmHsXED3Rz64nllblzhXHSXJ2dMqm6urUPO+A9+YRKT4/fH+NRv7ajrKf+40/mROBNPy6O1gcd4XR6gLU3uo0e3M7d21qvd2jaSmHe9j1JzUqdDVNT3PEv8xlW1WOapWzM+7LzSumhkQmrdFqThAsqIlFpT9wI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576767073; 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=2o6mDr1fG8NU9piwSzBHbLnyfs5bDrLIaLkFwXpQBd8=; b=E5BMTBGUeaZKyohlTPEMhCl1G9V4ws+j8Dt9UQPOLFSY/9bFi9IFKC2BJmvPvabY9tTVAfz8Oe30GV9teXH7rWtMKqAdqvCgKhgi3Hi0NtqOjI6S3JK/b4aTbZmKGpud9npnuTgrG5zcpWj30oovX9Sf6znzSwF6IZuUx8MgZyo= 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 1576767073722313.6581974448551; Thu, 19 Dec 2019 06:51:13 -0800 (PST) Received: from localhost ([::1]:43078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihx8y-0005UM-AZ for importer@patchew.org; Thu, 19 Dec 2019 09:51:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58656) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihwxQ-0005Sd-Bd for qemu-devel@nongnu.org; Thu, 19 Dec 2019 09:39:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihwxO-0006ip-CV for qemu-devel@nongnu.org; Thu, 19 Dec 2019 09:39:15 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36402 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ihwxM-0006gi-JI for qemu-devel@nongnu.org; Thu, 19 Dec 2019 09:39:13 -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-246-evVQ1u4uNMOt03rTdSzGMg-1; Thu, 19 Dec 2019 09:39:07 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C37C9100F08C; Thu, 19 Dec 2019 14:39:06 +0000 (UTC) Received: from localhost (ovpn-205-138.brq.redhat.com [10.40.205.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A84F963F60; Thu, 19 Dec 2019 14:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576766351; 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=2o6mDr1fG8NU9piwSzBHbLnyfs5bDrLIaLkFwXpQBd8=; b=IC8l/zLIqtPrI+gl4lVdByiPtofrbql6DedFd23T2RM5HlRU9BlbTloXva7lySd5qJ4mrc 5FeeBxfYqhT2PlI06tXiqEmtjm8MbewLLaB8Y/k/NXF4l/EGj/U6UbnV64vWuhr6gZ5jzz V6ffOgAO1V6gYuVXBi5E9/CbW9+Xv/s= From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 12/18] iotests: Derive image names from $TEST_IMG Date: Thu, 19 Dec 2019 15:38:12 +0100 Message-Id: <20191219143818.1646168-13-mreitz@redhat.com> In-Reply-To: <20191219143818.1646168-1-mreitz@redhat.com> References: <20191219143818.1646168-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: evVQ1u4uNMOt03rTdSzGMg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 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" Avoid creating images with custom filenames in $TEST_DIR, because non-file protocols may want to keep $TEST_IMG (and all other test images) in some other directory. Signed-off-by: Max Reitz --- tests/qemu-iotests/200 | 3 +-- tests/qemu-iotests/200.out | 4 ++-- tests/qemu-iotests/229 | 3 +-- tests/qemu-iotests/229.out | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200 index a2cdd7f83d..616b632a86 100755 --- a/tests/qemu-iotests/200 +++ b/tests/qemu-iotests/200 @@ -44,8 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 _supported_fmt qcow2 qed _supported_proto file =20 -BACKING_IMG=3D"${TEST_DIR}/backing.img" -TEST_IMG=3D"${TEST_DIR}/test.img" +BACKING_IMG=3D"$TEST_IMG.base" =20 TEST_IMG=3D"$BACKING_IMG" _make_test_img 512M _make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M diff --git a/tests/qemu-iotests/200.out b/tests/qemu-iotests/200.out index a6776070e4..5883f16ac3 100644 --- a/tests/qemu-iotests/200.out +++ b/tests/qemu-iotests/200.out @@ -1,6 +1,6 @@ QA output created by 200 -Formatting 'TEST_DIR/backing.img', fmt=3DIMGFMT size=3D536870912 -Formatting 'TEST_DIR/test.img', fmt=3DIMGFMT size=3D536870912 backing_file= =3DTEST_DIR/backing.img backing_fmt=3DIMGFMT +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=3DIMGFMT size=3D536870912 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D536870912 backing_file= =3DTEST_DIR/t.IMGFMT.base backing_fmt=3DIMGFMT wrote 314572800/314572800 bytes at offset 512 300 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) =20 diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229 index 866168b236..abc88f881f 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -47,8 +47,7 @@ _supported_proto file _supported_os Linux =20 =20 -DEST_IMG=3D"$TEST_DIR/d.$IMGFMT" -TEST_IMG=3D"$TEST_DIR/b.$IMGFMT" +DEST_IMG=3D"$TEST_IMG.dest" =20 _make_test_img 2M =20 diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out index 22350d75d7..ef96b85062 100644 --- a/tests/qemu-iotests/229.out +++ b/tests/qemu-iotests/229.out @@ -1,6 +1,6 @@ QA output created by 229 -Formatting 'TEST_DIR/b.IMGFMT', fmt=3DIMGFMT size=3D2097152 -Formatting 'TEST_DIR/d.IMGFMT', fmt=3DIMGFMT size=3D1048576 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2097152 +Formatting 'TEST_DIR/t.IMGFMT.dest', fmt=3DIMGFMT size=3D1048576 wrote 2097152/2097152 bytes at offset 0 2 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) {'execute': 'qmp_capabilities'} @@ -8,7 +8,7 @@ wrote 2097152/2097152 bytes at offset 0 =20 =3D=3D=3D Starting drive-mirror, causing error & stop =3D=3D=3D =20 -{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format': = 'IMGFMT', 'target': 'TEST_DIR/d.IMGFMT', 'sync': 'full', 'mode': 'existing'= , 'on-source-error': 'stop', 'on-target-error': 'stop' }} +{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format': = 'IMGFMT', 'target': 'TEST_DIR/t.IMGFMT.dest', 'sync': 'full', 'mode': 'exis= ting', 'on-source-error': 'stop', 'on-target-error': 'stop' }} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "created", "id": "testdisk"}} {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event"= : "JOB_STATUS_CHANGE", "data": {"status": "running", "id": "testdisk"}} {"return": {}} --=20 2.23.0