From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOTpI-0004Ju-2W for qemu-devel@nongnu.org; Tue, 03 Jan 2017 13:28:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOTpG-0001DJ-UL for qemu-devel@nongnu.org; Tue, 03 Jan 2017 13:28:48 -0500 From: "Daniel P. Berrange" Date: Tue, 3 Jan 2017 18:27:59 +0000 Message-Id: <20170103182801.9638-14-berrange@redhat.com> In-Reply-To: <20170103182801.9638-1-berrange@redhat.com> References: <20170103182801.9638-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH v1 13/15] iotests: enable tests 134 and 158 to work with qcow (v1) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , qemu-block@nongnu.org, "Daniel P. Berrange" The 138 and 158 iotests exercise the legacy qcow2 aes encryption code path. With a few simple tweaks they can exercise the same feature in qcow (v1). Signed-off-by: Daniel P. Berrange --- tests/qemu-iotests/134 | 10 +++++----- tests/qemu-iotests/158 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134 index dd080a2..23b7834 100755 --- a/tests/qemu-iotests/134 +++ b/tests/qemu-iotests/134 @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt qcow qcow2 _supported_proto generic _supported_os Linux @@ -55,19 +55,19 @@ QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT echo echo "== reading whole image ==" -$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== rewriting whole image ==" -$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "write -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== verify pattern ==" -$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRET -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt echo echo "== verify pattern failure with wrong password ==" -$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir +$QEMU_IO --object $SECRETALT -c "read -P 0xa 0 $size" --image-opts $IMGSPEC | _filter_qemu_io | _filter_testdir | _filter_imgfmt # success, all done diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158 index 7a1eb5c..2b53d9f 100755 --- a/tests/qemu-iotests/158 +++ b/tests/qemu-iotests/158 @@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt qcow2 +_supported_fmt qcow qcow2 _supported_proto generic _supported_os Linux -- 2.9.3