Note that 019 current fails for both qcow2 and qed due to an outdated .out file.
Signed-off-by: Stefan Hajnoczi <stefa...@linux.vnet.ibm.com> --- 017 | 2 +- 018 | 2 +- 019 | 2 +- 020 | 2 +- 024 | 4 ++-- 027 | 2 +- 028 | 2 +- common | 6 ++++++ common.rc | 3 ++- 9 files changed, 16 insertions(+), 9 deletions(-) diff --git a/017 b/017 index d861961..29dd53f 100755 --- a/017 +++ b/017 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk +_supported_fmt qcow qcow2 vmdk qed _supported_os Linux TEST_OFFSETS="0 4294967296" diff --git a/018 b/018 index 0a348fe..f155b49 100755 --- a/018 +++ b/018 @@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk +_supported_fmt qcow qcow2 vmdk qed _supported_os Linux TEST_OFFSETS="0 4294967296" diff --git a/019 b/019 index 896b8d9..cce529a 100755 --- a/019 +++ b/019 @@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk +_supported_fmt qcow qcow2 vmdk qed _supported_os Linux TEST_OFFSETS="0 4294967296" diff --git a/020 b/020 index 546e074..b065a53 100755 --- a/020 +++ b/020 @@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.pattern # Any format supporting backing files -_supported_fmt qcow qcow2 vmdk +_supported_fmt qcow qcow2 vmdk qed _supported_os Linux TEST_OFFSETS="0 4294967296" diff --git a/024 b/024 index 48680ca..ff6e984 100755 --- a/024 +++ b/024 @@ -41,8 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.filter . ./common.pattern -# Currently only qcow2 supports rebasing -_supported_fmt qcow2 +# Currently only qcow2 and qed support rebasing +_supported_fmt qcow2 qed _supported_os Linux CLUSTER_SIZE=65536 diff --git a/027 b/027 index 67ecffc..543c48f 100755 --- a/027 +++ b/027 @@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 . ./common.rc . ./common.filter -_supported_fmt vmdk qcow qcow2 +_supported_fmt vmdk qcow qcow2 qed _supported_os Linux diff --git a/028 b/028 index 0ca220e..cb8b255 100755 --- a/028 +++ b/028 @@ -44,7 +44,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 +_supported_fmt qcow2 qed _supported_os Linux # Choose a size that is not necessarily a cluster size multiple for image diff --git a/common b/common index 988fd5e..d95ba4c 100644 --- a/common +++ b/common @@ -119,6 +119,7 @@ check options -cow test cow -qcow test qcow -qcow2 test qcow2 + -qed test qed -vdi test vdi -vpc test vpc -vmdk test vmdk @@ -158,6 +159,11 @@ testlist options xpand=false ;; + -qed) + IMGFMT=qed + xpand=false + ;; + -vdi) IMGFMT=vdi xpand=false diff --git a/common.rc b/common.rc index da58f92..f2db92e 100644 --- a/common.rc +++ b/common.rc @@ -55,7 +55,7 @@ _make_test_img() # at least one argument (the image size) needs to be added local extra_img_options=$* - if [ "$IMGFMT" = "qcow2" -a -n "$CLUSTER_SIZE" ]; then + if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options" fi @@ -65,6 +65,7 @@ _make_test_img() sed -e "s#$IMGFMT#IMGFMT#g" | \ sed -e "s# encryption=off##g" | \ sed -e "s# cluster_size=0##g" | \ + sed -e "s# table_size=0##g" | \ sed -e "s# compat6=off##g" | \ sed -e "s# static=off##g" } -- 1.7.1