From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO8MJ-0000Po-Hx for qemu-devel@nongnu.org; Wed, 18 Feb 2015 12:24:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YO8MG-0006Zt-J0 for qemu-devel@nongnu.org; Wed, 18 Feb 2015 12:24:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58567) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YO8MG-0006Zn-Bx for qemu-devel@nongnu.org; Wed, 18 Feb 2015 12:24:20 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t1IHOINY009467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 18 Feb 2015 12:24:19 -0500 Message-ID: <54E4CAC1.2000409@redhat.com> Date: Wed, 18 Feb 2015 12:24:17 -0500 From: Max Reitz MIME-Version: 1.0 References: <1424272761-27554-1-git-send-email-kwolf@redhat.com> <1424272761-27554-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1424272761-27554-3-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=iso-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 2/2] qemu-iotests: Some qemu-img convert tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-devel@nongnu.org Cc: stefanha@redhat.com On 2015-02-18 at 10:19, Kevin Wolf wrote: > This adds a regression test for some problems that the qemu-img convert > rewrite just fixed. > > Signed-off-by: Kevin Wolf > --- > tests/qemu-iotests/122 | 83 ++++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/122.out | 30 +++++++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 114 insertions(+) > create mode 100755 tests/qemu-iotests/122 > create mode 100644 tests/qemu-iotests/122.out > > diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 > new file mode 100755 > index 0000000..e0c472f > --- /dev/null > +++ b/tests/qemu-iotests/122 > @@ -0,0 +1,83 @@ > +#!/bin/bash > +# > +# Test some qemu-img convert cases > +# > +# Copyright (C) 2015 Red Hat, Inc. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > +# > + > +# creator > +owner=kwolf@redhat.com > + > +seq="$(basename $0)" > +echo "QA output created by $seq" > + > +here="$PWD" > +tmp=/tmp/$$ > +status=1 # failure is the default! > + > +_cleanup() > +{ > + _cleanup_test_img > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > + > +_supported_fmt qcow2 > +_supported_proto generic > +_supported_os Linux > + > + > +TEST_IMG=$TEST_IMG.base _make_test_img 64M > +$QEMU_IO -c "write -P 0x11 0 64M" $TEST_IMG.base 2>&1 | _filter_qemu_io | _filter_testdir > + > + > +echo > +echo "=== Check allocation status regression with -B ===" > +echo > + > +_make_test_img -b $TEST_IMG.base > +$QEMU_IO -c "write -P 0x22 0 3M" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir > +$QEMU_IMG convert -O $IMGFMT -B $TEST_IMG.base $TEST_IMG $TEST_IMG.orig > +$QEMU_IMG map $TEST_IMG.orig | _filter_qemu_img_map > + > + > +echo > +echo "=== Check that zero clusters are kept in overlay ===" > +echo > + > +_make_test_img -b $TEST_IMG.base > + > +$QEMU_IO -c "write -P 0 0 3M" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir > +$QEMU_IMG convert -O $IMGFMT -B $TEST_IMG.base $TEST_IMG $TEST_IMG.orig > +$QEMU_IO -c "read -P 0 0 3M" $TEST_IMG.orig 2>&1 | _filter_qemu_io | _filter_testdir > +$QEMU_IMG convert -O $IMGFMT -c -B $TEST_IMG.base $TEST_IMG $TEST_IMG.orig > +$QEMU_IO -c "read -P 0 0 3M" $TEST_IMG.orig 2>&1 | _filter_qemu_io | _filter_testdir > + > +$QEMU_IO -c "write -z 0 3M" $TEST_IMG 2>&1 | _filter_qemu_io | _filter_testdir > +$QEMU_IMG convert -O $IMGFMT -B $TEST_IMG.base $TEST_IMG $TEST_IMG.orig > +$QEMU_IO -c "read -P 0 0 3M" $TEST_IMG.orig 2>&1 | _filter_qemu_io | _filter_testdir > +$QEMU_IMG convert -O $IMGFMT -c -B $TEST_IMG.base $TEST_IMG $TEST_IMG.orig > +$QEMU_IO -c "read -P 0 0 3M" $TEST_IMG.orig 2>&1 | _filter_qemu_io | _filter_testdir > + > +# TODO -B + -S 0 -> full allocation with no use of the backing file Also, -S 0 with -B (that is, with has_zero_init) and concatenation, please. But even without those: Reviewed-by: Max Reitz > + > +# success, all done > +echo '*** done' > +rm -f $seq.full > +status=0 > diff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out > new file mode 100644 > index 0000000..6124099 > --- /dev/null > +++ b/tests/qemu-iotests/122.out > @@ -0,0 +1,30 @@ > +QA output created by 122 > +Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 > +wrote 67108864/67108864 bytes at offset 0 > +64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > + > +=== Check allocation status regression with -B === > + > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.base' > +wrote 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +Offset Length File > +0 0x300000 TEST_DIR/t.IMGFMT.orig > +0x300000 0x3d00000 TEST_DIR/t.IMGFMT.base > + > +=== Check that zero clusters are kept in overlay === > + > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.base' > +wrote 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +wrote 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +read 3145728/3145728 bytes at offset 0 > +3 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 4b2b93b..28c78e5 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -117,3 +117,4 @@ > 113 rw auto quick > 114 rw auto quick > 116 rw auto quick > +122 rw auto quick