iotests: Disable broken streamOptimized tests

streamOptimized does not support writes that do not span exactly one
cluster.  Furthermore, it cannot rewrite already allocated clusters.
As such, many iotests do not work with it.  Disable them.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-id: 20190815153638.4600-6-mreitz@redhat.com
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>

diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index fd413bce48ee901f518dcc7882037ca8b415060c..1a0d411df55b6c16371b64829ee22cbe2acce052 100755 (executable)
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M

diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index ccd3a39dfb36aa2f5c363d9a875b7ee809dd226c..33eeade0deb552cf953a5cf2d57ca496989d3a77 100755 (executable)
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 size=128M
 offset=67M

diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 9c7681c19bcb0d3046f1983566caa174f52f7d7f..58442762fe366d0f5eb9bf7a1860d4fef2914bf1 100755 (executable)
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -43,7 +43,8 @@ _supported_fmt generic
 _supported_proto generic
 _supported_os Linux
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 # vpc is limited to 127GB, so we can't test it here
 if [ "$IMGFMT" = "vpc" ]; then

diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index 51b200db1d5935afe4e62cf1fd568feb6878c18d..4dc7d210f972188ebc9c54f680185ef1716127fb 100755 (executable)
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G

diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 48c533f63266b6a3d115906b4cbd7b8f238a29b2..df809b3088bb50a560faac0b2cfe1def2001920a 100755 (executable)
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G

diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index 56f704b5b9ebf3ae930feecd99587f6313e6af3f..57b99ae4a925f6d69f57d652506728fc3fcef01b 100755 (executable)
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=6G

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 79875de4543f55cfc9bccf12691471620417dc74..0a4b854e652045a30016184d780535eb8e273526 100755 (executable)
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -41,7 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
 _unsupported_proto vxhs
-_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 

diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index 78169838ba5dfd949316d1297baada060f8b5502..c69ce0920920a2a5d4d5bc5c1540803a7833b34d 100755 (executable)
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -41,7 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _supported_os Linux
-_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
+                     "streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 

diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index a56dd30bed604b95948528fd933d9b86e9cf2a14..b4f523460925900b8460d9d5b08e210793e764cf 100755 (executable)
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -47,7 +47,8 @@ _supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 CLUSTER_SIZE=65536

diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 6b0ebb37d2f399fc36b0663d637f746ad3ccfdbb..f41b92f35f52a2a745768123ad770ce472df2c16 100755 (executable)
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -44,7 +44,8 @@ _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 TEST_OFFSETS="0 4294967296"
 

diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index 4cb638022a11c963368d02697b376be33366c194..494be0921fa880b8c4700ad0f8f7d180e9645dec 100755 (executable)
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vmdk qcow qcow2 qed
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M

diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index 988a8c5d8fd34859f93a9b317ba0430437a4da60..8337a4d82515f46402fb8f1c206631fe5eb8de9c 100755 (executable)
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -42,6 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # This works for any image format (though unlikely to segfault for raw)
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo === Prepare image ===

diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index 362a48c0a07bc4ee53cb37cdcd67c4578c027fee..8b40991d555bdd7d424e3c99713d3d2ffeec9323 100755 (executable)
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt generic
 _supported_proto generic
+_unsupported_imgopts "subformat=streamOptimized"
 
 
 size=128M

diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
index 324bed28c6ff6f8da1e9d2cbe9ce9d8004be276e..da4cea1571e46d972ce0cdfc2c20787e3f09c4f8 100755 (executable)
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034
@@ -41,7 +41,8 @@ _supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 CLUSTER_SIZE=4k
 size=128M

diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index 4946b9be92493edaed7525c1435d069b465eb489..e6517acbd4cdf1d69a6711e24b6440d5589af726 100755 (executable)
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -40,7 +40,8 @@ _supported_fmt qcow qcow2 vmdk qed
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 CLUSTER_SIZE=4k
 size=128M

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index fe4892e4679857bbeb57b8ad5ab874e675ae85ee..7cf0427af44b6728f4e324d1306e99fd30acae1e 100755 (executable)
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -43,7 +43,8 @@ _supported_fmt qcow qcow2 vmdk qed raw
 _supported_proto file
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 _make_test_img 4M
 

diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index 661b36da2da66557dcdb48989a472156108395a6..f0b73e7e658fd2b0ec0ee7969a4eba22baa26097 100755 (executable)
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -38,6 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
 _supported_proto file
+_unsupported_imgopts "subformat=streamOptimized"
 
 IMG_SIZE=64M
 

diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 3346e8cb25424a4401933006ba4f808df6b049d6..4d55a2d3ef79011838cdf85019305b530b2ee2fa 100755 (executable)
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -39,7 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt qcow2 vmdk vhdx qed
 _supported_proto generic
 _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
-                     "subformat=twoGbMaxExtentSparse"
+                     "subformat=twoGbMaxExtentSparse" \
+                     "subformat=streamOptimized"
 
 echo
 echo "creating large image"

diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 383d7d7f6168a6ac8f5ce3187ee625abd5418f9a..1d4f6786db0c4c9186846df251acacb6ff273910 100755 (executable)
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -53,6 +53,7 @@ _supported_fmt generic
 _supported_proto generic
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo '=== Copy-on-read ==='

diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 958c14f5a075260f33da6f813abfd31d57e1e639..2eb377d6821811a3aefd41ed94eef929c42bf20d 100755 (executable)
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -50,6 +50,7 @@ _supported_fmt generic
 _supported_proto generic
 # LUKS support may be possible, but it complicates things.
 _unsupported_fmt luks
+_unsupported_imgopts "subformat=streamOptimized"
 
 echo
 echo '=== Copy-on-read ==='

diff --git a/tests/qemu-iotests/251 b/tests/qemu-iotests/251
index 13f85de9cdd8fcb4af2f4b45cc5eb5687c835095..7918ba3559d9c19cf98d073ed155ebb038ce1872 100755 (executable)
--- a/tests/qemu-iotests/251
+++ b/tests/qemu-iotests/251
@@ -40,6 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 _supported_fmt generic
 _supported_proto file
 _supported_os Linux
+_unsupported_imgopts "subformat=streamOptimized"
 
 if [ "$IMGOPTSSYNTAX" = "true" ]; then
     # We use json:{} filenames here, so we cannot work with additional options.