From patchwork Sun Jan 5 17:21:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 306995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6DF212C00A0 for ; Mon, 6 Jan 2014 04:31:46 +1100 (EST) Received: from localhost ([::1]:58810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrY8-0003Ah-7c for incoming@patchwork.ozlabs.org; Sun, 05 Jan 2014 12:31:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrR0-0000rY-PL for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzrQv-0002tV-7c for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:22 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:54036 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrQu-0002tF-TH for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:17 -0500 Received: (qmail 32479 invoked by uid 89); 5 Jan 2014 17:24:13 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/18317. hbedv: 8.2.12.166/7.11.123.168. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 10.270327 secs); 05 Jan 2014 17:24:13 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 5 Jan 2014 17:24:02 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 415D6206AF; Sun, 5 Jan 2014 18:20:40 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id BB5595FD4C; Sun, 5 Jan 2014 18:22:17 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sun, 5 Jan 2014 18:21:57 +0100 Message-Id: <1388942528-10453-8-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1388942528-10453-1-git-send-email-pl@kamp.de> References: <1388942528-10453-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: Kevin Wolf , Fam Zheng , ronniesahlberg@gmail.com, Jeff Cody , Peter Lieven , Max Reitz , owasserm@redhat.com, Federico Simoncelli , Stefan Hajnoczi , Wenchao Xia Subject: [Qemu-devel] [PATCHv2 07/18] qemu-iotests: fix test 019 to work with any protocol X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Peter Lieven --- tests/qemu-iotests/019 | 30 ++++++++++++++---------------- tests/qemu-iotests/019.out | 4 ++-- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019 index d75d125..5638611 100755 --- a/tests/qemu-iotests/019 +++ b/tests/qemu-iotests/019 @@ -32,9 +32,11 @@ status=1 # failure is the default! _cleanup() { - _cleanup_test_img - rm -f "$TEST_IMG.base" - rm -f "$TEST_IMG.orig" + _cleanup_test_img + if [ "$IMGPROTO" = "file" ]; then + rm -f "$TEST_IMG.base" + rm -f "$TEST_IMG.orig" + fi } trap "_cleanup; exit \$status" 0 1 2 3 15 @@ -45,46 +47,42 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files _supported_fmt qcow qcow2 vmdk qed -_supported_proto file +_supported_proto generic _supported_os Linux TEST_OFFSETS="0 4294967296" CLUSTER_SIZE=65536 -_make_test_img 6G +TEST_IMG=$TEST_IMG.base _make_test_img 6G echo "Filling base image" echo for offset in $TEST_OFFSETS; do # Some clusters with alternating backing file/image file reads - io_pattern writev $(( offset )) 512 1024 64 42 + TEST_IMG=$TEST_IMG.base io_pattern writev $(( offset )) 512 1024 64 42 # Complete backing clusters - io_pattern writev $(( offset + 1024 * 1024)) $CLUSTER_SIZE $CLUSTER_SIZE 1 42 + TEST_IMG=$TEST_IMG.base io_pattern writev $(( offset + 1024 * 1024)) $CLUSTER_SIZE $CLUSTER_SIZE 1 42 done -_check_test_img +TEST_IMG=$TEST_IMG.base _check_test_img echo "Creating test image with backing file" echo -mv "$TEST_IMG" "$TEST_IMG.base" -_make_test_img -b "$TEST_IMG.base" 6G +TEST_IMG=$TEST_IMG.orig _make_test_img -b "$TEST_IMG.base" 6G echo "Filling test image" echo for offset in $TEST_OFFSETS; do # Some clusters with alternating backing file/image file reads - io_pattern writev $(( offset + 512 )) 512 1024 64 43 + TEST_IMG=$TEST_IMG.orig io_pattern writev $(( offset + 512 )) 512 1024 64 43 # Complete test image clusters - io_pattern writev $(( offset + 1024 * 1024 + $CLUSTER_SIZE)) $CLUSTER_SIZE $CLUSTER_SIZE 1 43 + TEST_IMG=$TEST_IMG.orig io_pattern writev $(( offset + 1024 * 1024 + $CLUSTER_SIZE)) $CLUSTER_SIZE $CLUSTER_SIZE 1 43 done -_check_test_img - -mv "$TEST_IMG" "$TEST_IMG.orig" - +TEST_IMG=$TEST_IMG.orig _check_test_img # Test the conversion twice: One test with the old-style -B option and another diff --git a/tests/qemu-iotests/019.out b/tests/qemu-iotests/019.out index f0c6e63..f2c3da3 100644 --- a/tests/qemu-iotests/019.out +++ b/tests/qemu-iotests/019.out @@ -1,5 +1,5 @@ QA output created by 019 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=6442450944 Filling base image === IO: pattern 42 @@ -269,7 +269,7 @@ wrote 65536/65536 bytes at offset 4296015872 No errors were found on the image. Creating test image with backing file -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base' +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=6442450944 backing_file='TEST_DIR/t.IMGFMT.base' Filling test image === IO: pattern 43