From nobody Wed Dec 17 05:43:41 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1607708280; cv=none; d=zohomail.com; s=zohoarc; b=NqmsiFgWqTesobzvgwwi3Zs/2lcFrAHN3r87vnvh1i9KOENc/waK0CDE6Ux9Sgf+OPqgPk7x6VxwySU6dgr8Qs1iiOvyF8SeZlGW768vc+ApB/OuQyGacKZDOnjOnrJ/rk9JQBNl8nF6pkLFg+GTlS6vPV4eTfpATI+pFdY/aHc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607708280; 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=goZmBIyniVyMLlSXxfgjCKnVNMJmhLBkaO5nJxyHp/A=; b=nIrn4WaemWqA3wiQdFZ+FHEu33GVcDIKxtzogmo0k1aNjquZR9AYRJ6kytoyzGOC4MJKnoWf7Yug0TWp5DjVQ5UkRJuoxVOjkL0j6GijIZWys5tCn2K0/W5PVRQK+x5BX2oz2sh4MACHNrlX/PRyXNwslHoHcAZqbbZsVW2Yc94= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1607708280914743.5976995960865; Fri, 11 Dec 2020 09:38:00 -0800 (PST) Received: from localhost ([::1]:49356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1knmMh-0005uo-7s for importer@patchew.org; Fri, 11 Dec 2020 12:37:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50308) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1knluv-00048p-48 for qemu-devel@nongnu.org; Fri, 11 Dec 2020 12:09:17 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22466) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1knluN-0002C4-QI for qemu-devel@nongnu.org; Fri, 11 Dec 2020 12:09:14 -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-48-lchqb4DTNouqX9dMbSSUuA-1; Fri, 11 Dec 2020 12:08:39 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 97F9A100C660; Fri, 11 Dec 2020 17:08:38 +0000 (UTC) Received: from merkur.redhat.com (ovpn-114-231.ams2.redhat.com [10.36.114.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96E835D731; Fri, 11 Dec 2020 17:08:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1607706522; 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=goZmBIyniVyMLlSXxfgjCKnVNMJmhLBkaO5nJxyHp/A=; b=FPZ657PQ+X82jNq/hBtjZXweLKu6dZn3PvkAK6iqGG42DZgiCh1VJbdmyToQAYzwSkhYlT DMkblPQYoyAQDI/h4iP/RGk1/uHap/4wc5TvqC3/zK1AgF+lmVr/1bbns3dE07UZN3dmvl EhhN7fIdFGmQ5+ERsDPlxElKnBPef2o= X-MC-Unique: lchqb4DTNouqX9dMbSSUuA-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PULL 15/34] iotests: Derive image names from $TEST_IMG Date: Fri, 11 Dec 2020 18:07:53 +0100 Message-Id: <20201211170812.228643-16-kwolf@redhat.com> In-Reply-To: <20201211170812.228643-1-kwolf@redhat.com> References: <20201211170812.228643-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@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=63.128.21.124; envelope-from=kwolf@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 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: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Max Reitz 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 Reviewed-by: Kevin Wolf Message-Id: <20201027190600.192171-12-mreitz@redhat.com> Signed-off-by: Kevin Wolf --- 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 59f7854b9f..a7aabbd032 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 89a5359f32..5f759fa587 100755 --- a/tests/qemu-iotests/229 +++ b/tests/qemu-iotests/229 @@ -51,8 +51,7 @@ _supported_os Linux _unsupported_imgopts data_file =20 =20 -DEST_IMG=3D"$TEST_DIR/d.$IMGFMT" -TEST_IMG=3D"$TEST_DIR/b.$IMGFMT" +DEST_IMG=3D"$TEST_IMG.dest" BLKDEBUG_CONF=3D"$TEST_DIR/blkdebug.conf" =20 _make_test_img 2M diff --git a/tests/qemu-iotests/229.out b/tests/qemu-iotests/229.out index 4de6dfaa28..7eed393013 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=3D2097152 +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2097152 +Formatting 'TEST_DIR/t.IMGFMT.dest', fmt=3DIMGFMT size=3D2097152 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': 'blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/d.IMGFMT', 's= ync': 'full', 'mode': 'existing', 'on-source-error': 'stop', 'on-target-err= or': 'stop' }} +{'execute': 'drive-mirror', 'arguments': {'device': 'testdisk', 'format': = 'IMGFMT', 'target': 'blkdebug:TEST_DIR/blkdebug.conf:TEST_DIR/t.IMGFMT.dest= ', 'sync': 'full', 'mode': 'existing', 'on-source-error': 'stop', 'on-targe= t-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.29.2