提交 1f7bf7d0 编写于 作者: P Peter Lieven 提交者: Kevin Wolf

qemu-iotests: change _supported_proto to file for various tests

all these tests do anything of the following and thus fail with any
protocol other than file:
 - the tests use rm, cp or mv shell commands which only work on file
 - the tests use qcow2.py
 - the images construct new filenames (e.g. backing file names) and
   the logic is broken for anything else than file
Signed-off-by: NPeter Lieven <pl@kamp.de>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 6542aa9c
...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# much of this could be generic for any format supporting compression. # much of this could be generic for any format supporting compression.
_supported_fmt qcow qcow2 _supported_fmt qcow qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
TEST_OFFSETS="0 4294967296" TEST_OFFSETS="0 4294967296"
......
...@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# much of this could be generic for any format supporting snapshots # much of this could be generic for any format supporting snapshots
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
TEST_OFFSETS="0 4294967296" TEST_OFFSETS="0 4294967296"
......
...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files # Any format supporting backing files
_supported_fmt qcow qcow2 vmdk qed _supported_fmt qcow qcow2 vmdk qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
......
...@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files # Any format supporting backing files
_supported_fmt qcow qcow2 vmdk qed _supported_fmt qcow qcow2 vmdk qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \ _unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentFlat" \
......
...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# much of this could be generic for any format supporting compression. # much of this could be generic for any format supporting compression.
_supported_fmt qcow qcow2 _supported_fmt qcow qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
TEST_OFFSETS="0 4294967296" TEST_OFFSETS="0 4294967296"
......
...@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Currently only qcow2 and qed support rebasing # Currently only qcow2 and qed support rebasing
_supported_fmt qcow2 qed _supported_fmt qcow2 qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
CLUSTER_SIZE=65536 CLUSTER_SIZE=65536
......
...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Currently only qcow2 supports rebasing # Currently only qcow2 supports rebasing
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_default_cache_mode "writethrough" _default_cache_mode "writethrough"
_supported_cache_modes "writethrough" "none" _supported_cache_modes "writethrough" "none"
......
...@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files except vmdk and qcow which do not support # Any format supporting backing files except vmdk and qcow which do not support
# smaller backing files. # smaller backing files.
_supported_fmt qcow2 qed _supported_fmt qcow2 qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
# Choose a size that is not necessarily a cluster size multiple for image # Choose a size that is not necessarily a cluster size multiple for image
......
...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality # This tests qcow2-specific low-level functionality
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
CLUSTER_SIZE=65536 CLUSTER_SIZE=65536
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow qcow2 vmdk qed _supported_fmt qcow qcow2 vmdk qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \ _unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentFlat" \
......
...@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality # This tests qcow2-specific low-level functionality
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
# Only qcow2v3 and later supports feature bits # Only qcow2v3 and later supports feature bits
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow qcow2 vmdk qed _supported_fmt qcow qcow2 vmdk qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \ _unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentFlat" \
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow2 qed _supported_fmt qcow2 qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
CLUSTER_SIZE=2M CLUSTER_SIZE=2M
......
...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_default_cache_mode "writethrough" _default_cache_mode "writethrough"
_supported_cache_modes "writethrough" _supported_cache_modes "writethrough"
......
...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files # Any format supporting backing files
_supported_fmt qcow2 qed _supported_fmt qcow2 qed
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
CLUSTER_SIZE=64k CLUSTER_SIZE=64k
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt generic _supported_fmt generic
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_default_cache_mode "writethrough" _default_cache_mode "writethrough"
_supported_cache_modes "writethrough" _supported_cache_modes "writethrough"
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
echo echo
......
...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests vmdk-specific low-level functionality # This tests vmdk-specific low-level functionality
_supported_fmt vmdk _supported_fmt vmdk
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \ _unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentFlat" \
......
...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality # This tests qocw2-specific low-level functionality
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
rt_offset=65536 # 0x10000 (XXX: just an assumption) rt_offset=65536 # 0x10000 (XXX: just an assumption)
......
...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality # This tests qocw2-specific low-level functionality
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
echo echo
......
...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern . ./common.pattern
_supported_fmt qcow qcow2 vmdk qed raw _supported_fmt qcow qcow2 vmdk qed raw
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \ _unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \ "subformat=twoGbMaxExtentFlat" \
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt cow qed qcow qcow2 vmdk _supported_fmt cow qed qcow qcow2 vmdk
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt qcow2 _supported_fmt qcow2
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
function do_run_qemu() function do_run_qemu()
......
...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15 ...@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter . ./common.filter
_supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow cow _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow cow
_supported_proto generic _supported_proto file
_supported_os Linux _supported_os Linux
IMG_SIZE=64M IMG_SIZE=64M
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册