From nobody Sat Sep 21 00:46:20 2024 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=1582564662; cv=none; d=zohomail.com; s=zohoarc; b=dFZ0HirlYl6gIbHt94z54Q7dq/XMim5ffahlxAwAgD1ZY40LqbYIZ/F+eX2aOOXLML1z8TFD/AhJIbApnf+QPOMV0oCch+BWjf51WYei2cULX42Byr+U44VG85scL8ZhX9yMnu07LK2joFpmdlBU/sb8u9tQ/+OOsKzWZDfNFrE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582564662; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=TyMCqejM+7TBzqzeLoooX5dQqYB4s2A/WwyaKEswkHk=; b=hllviuCeueMB2rXRYB9YihVTQfFVH5CEj0S9wBO4m+49+UBKB7vB///lq1Mk6t0NkolY9PJZpxvzTwipBy4LEhRCIpiRHqaHUWiCtIM3ThDLN7AhKKqy8H2pugb/YK7kmM2Z1d/Dt/bk7iigBAVJHizYOBkGm2xfWXHPOiupYOM= 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 1582564662610855.6509563500756; Mon, 24 Feb 2020 09:17:42 -0800 (PST) Received: from localhost ([::1]:39830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6HMT-0001be-Co for importer@patchew.org; Mon, 24 Feb 2020 12:17:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48821) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6HLV-0000uJ-Mr for qemu-devel@nongnu.org; Mon, 24 Feb 2020 12:16:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6HLT-0003FX-Oe for qemu-devel@nongnu.org; Mon, 24 Feb 2020 12:16:41 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:57681 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 1j6HLT-0003E8-D7 for qemu-devel@nongnu.org; Mon, 24 Feb 2020 12:16:39 -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-193-zTwPwY0dMZKx2SlZTY7a0Q-1; Mon, 24 Feb 2020 12:16:34 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8701D13E4; Mon, 24 Feb 2020 17:16:33 +0000 (UTC) Received: from localhost (unknown [10.36.118.163]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2B4085D9CD; Mon, 24 Feb 2020 17:16:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582564598; 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; bh=TyMCqejM+7TBzqzeLoooX5dQqYB4s2A/WwyaKEswkHk=; b=B+x4Gau+9AjON/UjUtg2gcK89vYQb5y/f2Izk3eOfQ0y6IeNy19I46oUn13KMlvz3rZxEv XQXQfFuFhchHEBoHtgvXzF0deSEenfU0ZeniXI/FvmKu7Zc7EmOwXb6NPhjqXGOR8o5YYa En9w+UKB1vH4z/0fYDVUXcJYWwjhTYk= X-MC-Unique: zTwPwY0dMZKx2SlZTY7a0Q-1 From: Max Reitz To: qemu-block@nongnu.org Subject: [PATCH] iotests: Fix cleanup path in some tests Date: Mon, 24 Feb 2020 18:16:31 +0100 Message-Id: <20200224171631.384314-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: 207.211.31.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" Some iotests leave behind some external data file when run for qcow2 with -o data_file. Fix that. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- tests/qemu-iotests/085 | 1 + tests/qemu-iotests/087 | 6 ++++++ tests/qemu-iotests/279 | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 46981dbb64..dd3c993a2d 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -39,6 +39,7 @@ SNAPSHOTS=3D10 _cleanup() { _cleanup_qemu + _cleanup_test_img for i in $(seq 1 ${SNAPSHOTS}) do _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}" diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index d6c8613419..bdfdad3454 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -26,6 +26,12 @@ echo "QA output created by $seq" =20 status=3D1 # failure is the default! =20 +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + # get standard environment, filters and checks . ./common.rc . ./common.filter diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 index 30d29b1cb2..75a4747e6b 100755 --- a/tests/qemu-iotests/279 +++ b/tests/qemu-iotests/279 @@ -26,7 +26,7 @@ status=3D1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_IMG.mid" + _rm_test_img "$TEST_IMG.mid" } trap "_cleanup; exit \$status" 0 1 2 3 15 =20 --=20 2.24.1