From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MOd1b-0000cY-3o for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:41:51 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MOd1W-0000Xk-KJ for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:41:50 -0400 Received: from [199.232.76.173] (port=57504 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MOd1W-0000XQ-Dp for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:41:46 -0400 Received: from verein.lst.de ([213.95.11.210]:56980) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1MOd1V-0002o2-Ue for qemu-devel@nongnu.org; Wed, 08 Jul 2009 15:41:46 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id n68Jfh68014690 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Wed, 8 Jul 2009 21:41:43 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id n68Jfhwk014689 for qemu-devel@nongnu.org; Wed, 8 Jul 2009 21:41:43 +0200 Date: Wed, 8 Jul 2009 21:41:43 +0200 From: Christoph Hellwig Message-ID: <20090708194143.GA14640@lst.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] qemu-iotests: make a few more tests generic List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Pretend that a non-implemented check is always successful and thus allow various tests that were qcow2-specific before to be generic. Signed-off-by: Christoph Hellwig Index: qemu-iotests/009 =================================================================== --- qemu-iotests.orig/009 2009-07-08 21:03:29.268364164 +0200 +++ qemu-iotests/009 2009-07-08 21:10:26.103364516 +0200 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt generic _supported_os Linux Index: qemu-iotests/010 =================================================================== --- qemu-iotests.orig/010 2009-07-08 21:03:29.274364788 +0200 +++ qemu-iotests/010 2009-07-08 21:10:26.104364852 +0200 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt generic _supported_os Linux Index: qemu-iotests/011 =================================================================== --- qemu-iotests.orig/011 2009-07-08 21:03:29.281364421 +0200 +++ qemu-iotests/011 2009-07-08 21:10:26.104364852 +0200 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt generic _supported_os Linux Index: qemu-iotests/013 =================================================================== --- qemu-iotests.orig/013 2009-07-08 21:10:19.394364074 +0200 +++ qemu-iotests/013 2009-07-08 21:29:03.448264691 +0200 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.pattern # much of this could be generic for any format supporting compression. -_supported_fmt qcow2 +_supported_fmt qcow qcow2 _supported_os Linux TEST_OFFSETS="0 4294967296" @@ -66,7 +66,7 @@ echo "Compressing image" echo mv $TEST_IMG $TEST_IMG.orig -$QEMU_IMG convert -f qcow2 -O qcow2 -c $TEST_IMG.orig $TEST_IMG +$QEMU_IMG convert -f $IMGFMT -O $IMGFMT -c $TEST_IMG.orig $TEST_IMG echo "Testing compressed image" echo Index: qemu-iotests/014 =================================================================== --- qemu-iotests.orig/014 2009-07-08 21:03:29.384364533 +0200 +++ qemu-iotests/014 2009-07-08 21:10:26.109364301 +0200 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.filter . ./common.pattern -# much of this could be generic for any format supporting compression. +# much of this could be generic for any format supporting snapshots _supported_fmt qcow2 _supported_os Linux Index: qemu-iotests/015 =================================================================== --- qemu-iotests.orig/015 2009-07-08 21:10:24.862372246 +0200 +++ qemu-iotests/015 2009-07-08 21:10:26.110364568 +0200 @@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 1 . ./common.rc . ./common.filter -# currently only qcow2 allows for consistency checks using qemu-img +# actually any format that supports snapshots _supported_fmt qcow2 _supported_os Linux Index: qemu-iotests/common.rc =================================================================== --- qemu-iotests.orig/common.rc 2009-07-08 21:03:29.393364072 +0200 +++ qemu-iotests/common.rc 2009-07-08 21:10:26.111364626 +0200 @@ -75,7 +75,8 @@ _cleanup_test_img() _check_test_img() { - $QEMU_IMG check -f $IMGFMT $TEST_IMG + $QEMU_IMG check -f $IMGFMT $TEST_IMG 2>&1 | \ + sed -e 's/qemu-img\: This image format does not support checks/No errors were found on the image./' } _get_pids_by_name() Index: qemu-iotests/common.pattern =================================================================== --- qemu-iotests.orig/common.pattern 2009-07-08 21:03:29.398364429 +0200 +++ qemu-iotests/common.pattern 2009-07-08 21:10:26.112364683 +0200 @@ -96,7 +96,7 @@ function io_test2() { io_pattern writev $((offset + 8 * 4096)) 4096 $((9 * 4096)) 256 165 mv $TEST_IMG $TEST_IMG.orig - $QEMU_IMG convert -f qcow2 -O qcow2 -c $TEST_IMG.orig $TEST_IMG + $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -c $TEST_IMG.orig $TEST_IMG # Write the used clusters echo === Used clusters [1]