From nobody Wed Nov 12 10:08:37 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 ARC-Seal: i=1; a=rsa-sha256; t=1569577847; cv=none; d=zoho.com; s=zohoarc; b=eBUhz6UGzAxgJCVaGfrJiQp7EGKu1hXsZAAln6FPIjxfm3vEbDWxbT5/3fPvWAYr9TggLDq2+5RMBms/BId48FdZ8JEM+ZdueHPu350nhINYTsaWyBlRgqDFBsHdF41H8Ojr1IZSS2NnaFgKMIwOIwZ6JfyouQA4D90G2RNbbnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569577847; h=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:ARC-Authentication-Results; bh=XfoD2hg9aaVeQLlfzETLDeCXxaB69Wmmtt9BsShmjpY=; b=a9jtldzdW+QXaW7MlOmvLEGlZq6QSelepwurTTMRyirCBABMfQMyJoyFEdBuED1SI38xY72RZqbdk/tf6uJu8I0WkF+tN2HWUCRI5H586w6MtRivsLwKtCbQGU1pB1JIdbMd2tIcJZQdboa5aVDckcQWd39cXhkZP3+HUdZbgn0= ARC-Authentication-Results: i=1; mx.zoho.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 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 1569577847054698.1038966234487; Fri, 27 Sep 2019 02:50:47 -0700 (PDT) Received: from localhost ([::1]:49028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmtc-0001lT-ET for importer@patchew.org; Fri, 27 Sep 2019 05:50:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33499) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDmmV-0003as-OK for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDmmT-0007re-Ua for qemu-devel@nongnu.org; Fri, 27 Sep 2019 05:43:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48628) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDmmQ-0007lh-TE; Fri, 27 Sep 2019 05:43:15 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 26B473090FE1; Fri, 27 Sep 2019 09:43:14 +0000 (UTC) Received: from localhost (ovpn-204-76.brq.redhat.com [10.40.204.76]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B27276012C; Fri, 27 Sep 2019 09:43:13 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH 12/18] iotests: Avoid cp/mv of test images Date: Fri, 27 Sep 2019 11:42:36 +0200 Message-Id: <20190927094242.11152-13-mreitz@redhat.com> In-Reply-To: <20190927094242.11152-1-mreitz@redhat.com> References: <20190927094242.11152-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Fri, 27 Sep 2019 09:43:14 +0000 (UTC) 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: 209.132.183.28 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" Content-Type: text/plain; charset="utf-8" This will not work with external data files, so try to get tests working without it as far as possible. Signed-off-by: Max Reitz Reviewed-by: Maxim Levitsky --- tests/qemu-iotests/063 | 12 ++++-------- tests/qemu-iotests/063.out | 3 ++- tests/qemu-iotests/085 | 9 +++------ tests/qemu-iotests/085.out | 8 ++++---- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063 index eef2b8a534..c750b3806e 100755 --- a/tests/qemu-iotests/063 +++ b/tests/qemu-iotests/063 @@ -51,15 +51,13 @@ _unsupported_imgopts "subformat=3DmonolithicFlat" \ _make_test_img 4M =20 echo "=3D=3D Testing conversion with -n fails with no target file =3D=3D" -# check .orig file does not exist -rm -f "$TEST_IMG.orig" if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig"= >/dev/null 2>&1; then exit 1 fi =20 echo "=3D=3D Testing conversion with -n succeeds with a target file =3D=3D" -rm -f "$TEST_IMG.orig" -cp "$TEST_IMG" "$TEST_IMG.orig" +_rm_test_img "$TEST_IMG.orig" +TEST_IMG=3D"$TEST_IMG.orig" _make_test_img 4M if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.ori= g" ; then exit 1 fi @@ -85,10 +83,8 @@ fi _check_test_img =20 echo "=3D=3D Testing conversion to a smaller file fails =3D=3D" -rm -f "$TEST_IMG.orig" -mv "$TEST_IMG" "$TEST_IMG.orig" -_make_test_img 2M -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG"= >/dev/null 2>&1; then +TEST_IMG=3D"$TEST_IMG.target" _make_test_img 2M +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.targe= t" >/dev/null 2>&1; then exit 1 fi =20 diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out index 7b691b2c9e..890b719bf0 100644 --- a/tests/qemu-iotests/063.out +++ b/tests/qemu-iotests/063.out @@ -2,11 +2,12 @@ QA output created by 063 Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D4194304 =3D=3D Testing conversion with -n fails with no target file =3D=3D =3D=3D Testing conversion with -n succeeds with a target file =3D=3D +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=3DIMGFMT size=3D4194304 =3D=3D Testing conversion to raw is the same after conversion with -n =3D= =3D =3D=3D Testing conversion back to original format =3D=3D No errors were found on the image. =3D=3D Testing conversion to a smaller file fails =3D=3D -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D2097152 +Formatting 'TEST_DIR/t.IMGFMT.target', fmt=3DIMGFMT size=3D2097152 =3D=3D Regression testing for copy offloading bug =3D=3D Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D1048576 Formatting 'TEST_DIR/t.IMGFMT.target', fmt=3DIMGFMT size=3D1048576 diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index bbea1252d2..46981dbb64 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -105,8 +105,7 @@ add_snapshot_image() { base_image=3D"${TEST_DIR}/$((${1}-1))-${snapshot_virt0}" snapshot_file=3D"${TEST_DIR}/${1}-${snapshot_virt0}" - _make_test_img -u -b "${base_image}" "$size" - mv "${TEST_IMG}" "${snapshot_file}" + TEST_IMG=3D$snapshot_file _make_test_img -u -b "${base_image}" "$size" do_blockdev_add "$1" "'backing': null, " "${snapshot_file}" } =20 @@ -122,10 +121,8 @@ blockdev_snapshot() =20 size=3D128M =20 -_make_test_img $size -mv "${TEST_IMG}" "${TEST_IMG}.1" -_make_test_img $size -mv "${TEST_IMG}" "${TEST_IMG}.2" +TEST_IMG=3D"$TEST_IMG.1" _make_test_img $size +TEST_IMG=3D"$TEST_IMG.2" _make_test_img $size =20 echo echo =3D=3D=3D Running QEMU =3D=3D=3D diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out index 2a5f256cd3..313198f182 100644 --- a/tests/qemu-iotests/085.out +++ b/tests/qemu-iotests/085.out @@ -1,6 +1,6 @@ QA output created by 085 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=3DIMGFMT size=3D134217728 +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=3DIMGFMT size=3D134217728 =20 =3D=3D=3D Running QEMU =3D=3D=3D =20 @@ -55,10 +55,10 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=3Dqcow2= size=3D134217728 backing_fil =20 =3D=3D=3D Create a couple of snapshots using blockdev-snapshot =3D=3D=3D =20 -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_file= =3DTEST_DIR/10-snapshot-v0.IMGFMT +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=3DIMGFMT size=3D134217728= backing_file=3DTEST_DIR/10-snapshot-v0.IMGFMT {"return": {}} {"return": {}} -Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 backing_file= =3DTEST_DIR/11-snapshot-v0.IMGFMT +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=3DIMGFMT size=3D134217728= backing_file=3DTEST_DIR/11-snapshot-v0.IMGFMT {"return": {}} {"return": {}} =20 --=20 2.21.0