From patchwork Sun Jan 5 17:22:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 306993 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 B4E222C00CB for ; Mon, 6 Jan 2014 04:29:57 +1100 (EST) Received: from localhost ([::1]:58790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrWN-0000q2-2t for incoming@patchwork.ozlabs.org; Sun, 05 Jan 2014 12:29:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrSm-0004Cx-59 for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:26:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzrSf-0003Qj-SB for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:26:12 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:46550 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrSf-0003Qa-IL for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:26:05 -0500 Received: (qmail 32712 invoked by uid 89); 5 Jan 2014 17:26:04 -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 1.110806 secs); 05 Jan 2014 17:26:04 -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:26:03 -0000 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 7357A206B9; Sun, 5 Jan 2014 18:20:40 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id EC5AC5FD4C; Sun, 5 Jan 2014 18:22:17 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sun, 5 Jan 2014 18:22:05 +0100 Message-Id: <1388942528-10453-16-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 15/18] qemu-iotests: fix test 046 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/046 | 9 +++------ tests/qemu-iotests/046.out | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046 index 2d44bbb..2a69a11 100755 --- a/tests/qemu-iotests/046 +++ b/tests/qemu-iotests/046 @@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter _supported_fmt qcow2 -_supported_proto file +_supported_proto generic _supported_os Linux CLUSTER_SIZE=64k @@ -48,8 +48,6 @@ size=128M echo echo "== creating backing file for COW tests ==" -_make_test_img $size - function backing_io() { local offset=$1 @@ -66,9 +64,8 @@ function backing_io() done } -backing_io 0 32 write | $QEMU_IO "$TEST_IMG" | _filter_qemu_io - -mv "$TEST_IMG" "$TEST_IMG.base" +TEST_IMG=$TEST_IMG.base _make_test_img $size +backing_io 0 32 write | $QEMU_IO "$TEST_IMG.base" | _filter_qemu_io _make_test_img -b "$TEST_IMG.base" 6G diff --git a/tests/qemu-iotests/046.out b/tests/qemu-iotests/046.out index 65d584b..d1d49d8 100644 --- a/tests/qemu-iotests/046.out +++ b/tests/qemu-iotests/046.out @@ -1,7 +1,7 @@ QA output created by 046 == creating backing file for COW tests == -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=134217728 wrote 65536/65536 bytes at offset 0 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) wrote 65536/65536 bytes at offset 65536