aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2011-06-08 13:23:33 +0200
committerKevin Wolf <kwolf@redhat.com>2012-02-23 10:29:47 +0100
commitbfe852486224d604c259b362bc4c952cc934ef0b (patch)
tree58f93d96ce45d95cdbef8a4ee839fa8d6a492ff4 /tests
parent25bb8a365a5388fa22a5be5de65534801a3e7315 (diff)
qemu-iotests: Update filter for default cluster size
Until recently, qemu-img create displayed cluster_size=0 for the default cluster size. It is changed to display the real cluster size now, which results in the cluster size not being filtered out any more. If the cluster size is specified explicitly in CLUSTER_SIZE, keep the output, and if using the default, filter it out. This mostly restores the old behaviour of the test cases; test 015 must be fixed to use CLUSTER_SIZE instead of using extra_img_options for it. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/qemu-iotests/0153
-rw-r--r--tests/qemu-iotests/common.rc4
2 files changed, 5 insertions, 2 deletions
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index bdafd2629..44c134f94 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -56,7 +56,8 @@ echo "creating image"
# for the refcount table. On the other hand this is big enough to cause a
# refcount table growth when rewriting the image after creating one snapshot.
size=36M
-_make_test_img -o cluster_size=1k $size
+CLUSTER_SIZE=1k
+_make_test_img $size
# Create two snapshots which fill the image with two different patterns
echo "creating first snapshot"
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index cdefafc62..26811ca66 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -58,9 +58,11 @@ _make_test_img()
# extra qemu-img options can be added by tests
# at least one argument (the image size) needs to be added
local extra_img_options=$*
+ local cluster_size_filter="s# cluster_size=[0-9]\\+##g"
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
+ cluster_size_filter=""
fi
# XXX(hch): have global image options?
@@ -69,7 +71,7 @@ _make_test_img()
sed -e "s#$TEST_DIR#TEST_DIR#g" | \
sed -e "s#$IMGFMT#IMGFMT#g" | \
sed -e "s# encryption=off##g" | \
- sed -e "s# cluster_size=0##g" | \
+ sed -e "$cluster_size_filter" | \
sed -e "s# table_size=0##g" | \
sed -e "s# compat6=off##g" | \
sed -e "s# static=off##g"