From patchwork Sun Jan 5 17:22:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 306992 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 942142C00A0 for ; Mon, 6 Jan 2014 04:28:47 +1100 (EST) Received: from localhost ([::1]:58780 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrVF-0007Hw-EY for incoming@patchwork.ozlabs.org; Sun, 05 Jan 2014 12:28:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53914) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrQx-0000kE-Cf for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VzrQr-0002sK-OQ for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:19 -0500 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:59965 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VzrQr-0002rz-4u for qemu-devel@nongnu.org; Sun, 05 Jan 2014 12:24:13 -0500 Received: (qmail 32448 invoked by uid 89); 5 Jan 2014 17:24:12 -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.13898 secs); 05 Jan 2014 17:24:12 -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:11 -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 541F7206B2; Sun, 5 Jan 2014 18:20:40 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id CDED75FD4C; Sun, 5 Jan 2014 18:22:17 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Sun, 5 Jan 2014 18:22:00 +0100 Message-Id: <1388942528-10453-11-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 10/18] qemu-iotests: fix test 028 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/028 | 9 ++++----- tests/qemu-iotests/028.out | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index a99e4fa..4c7644d 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 # Any format supporting backing files except vmdk and qcow which do not support # smaller backing files. _supported_fmt qcow2 qed -_supported_proto file +_supported_proto generic _supported_os Linux # Choose a size that is not necessarily a cluster size multiple for image @@ -58,20 +58,19 @@ base_size=$(( image_size - 1024 * 1024 * 1024 )) offset=$(( base_size - 32 * 1024 )) -_make_test_img $base_size +TEST_IMG=$TEST_IMG.base _make_test_img $base_size echo "Filling base image" echo # Fill end of base image with a pattern, skipping every other sector -io writev $offset 512 1024 32 +TEST_IMG=$TEST_IMG.base io writev $offset 512 1024 32 -_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" $image_size echo "Filling test image" diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out index 8affb7f..444e89a 100644 --- a/tests/qemu-iotests/028.out +++ b/tests/qemu-iotests/028.out @@ -1,5 +1,5 @@ QA output created by 028 -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=3221227008 +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=3221227008 Filling base image === IO: pattern 195