958e1b
From 0b8d9819cfe455e9ff4c2c77de1dd8069d00ce9c Mon Sep 17 00:00:00 2001
958e1b
Message-Id: <0b8d9819cfe455e9ff4c2c77de1dd8069d00ce9c.1418766606.git.jen@redhat.com>
958e1b
In-Reply-To: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com>
958e1b
References: <6f81b4847eb68ebdf54a8f1a771e19d112d74152.1418766606.git.jen@redhat.com>
958e1b
From: Fam Zheng <famz@redhat.com>
958e1b
Date: Thu, 4 Dec 2014 00:04:59 -0600
958e1b
Subject: [CHANGE 05/31] qemu-iotests: Add _unsupported_imgopts for vmdk
958e1b
 subformats
958e1b
To: rhvirt-patches@redhat.com,
958e1b
    jen@redhat.com
958e1b
958e1b
RH-Author: Fam Zheng <famz@redhat.com>
958e1b
Message-id: <1417651524-18041-6-git-send-email-famz@redhat.com>
958e1b
Patchwork-id: 62678
958e1b
O-Subject: [RHEL-7.1 qemu-kvm PATCH v5 05/30] qemu-iotests: Add _unsupported_imgopts for vmdk subformats
958e1b
Bugzilla: 1002493
958e1b
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
958e1b
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
958e1b
RH-Acked-by: Max Reitz <mreitz@redhat.com>
958e1b
958e1b
Some cases are not applicable for vmdk subformats those don't support
958e1b
certain features, e.g. backing file, and some others can't run on
958e1b
mult-file image, e.g. monolithicFlat. This adds declaration in test
958e1b
cases to skip them automatically, so that iotests on vmdk can go
958e1b
more smoothly (without manually picking of cases for each subformat).
958e1b
958e1b
Signed-off-by: Fam Zheng <famz@redhat.com>
958e1b
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
958e1b
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
958e1b
(cherry picked from commit d2329f27c9c8408d4134c7243313dbaa37270384)
958e1b
Signed-off-by: Fam Zheng <famz@redhat.com>
958e1b
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
958e1b
---
958e1b
 tests/qemu-iotests/017 | 1 +
958e1b
 tests/qemu-iotests/018 | 1 +
958e1b
 tests/qemu-iotests/019 | 3 +++
958e1b
 tests/qemu-iotests/020 | 3 +++
958e1b
 tests/qemu-iotests/034 | 3 +++
958e1b
 tests/qemu-iotests/037 | 3 +++
958e1b
 tests/qemu-iotests/059 | 3 +++
958e1b
 tests/qemu-iotests/063 | 3 +++
958e1b
 tests/qemu-iotests/069 | 1 +
958e1b
 9 files changed, 21 insertions(+)
958e1b
958e1b
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
958e1b
index aba3faf..3af3cdf 100755
958e1b
--- a/tests/qemu-iotests/017
958e1b
+++ b/tests/qemu-iotests/017
958e1b
@@ -43,6 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
958e1b
 
958e1b
 TEST_OFFSETS="0 4294967296"
958e1b
 
958e1b
diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
958e1b
index 15fcfe5..6f7f054 100755
958e1b
--- a/tests/qemu-iotests/018
958e1b
+++ b/tests/qemu-iotests/018
958e1b
@@ -43,6 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
958e1b
 
958e1b
 TEST_OFFSETS="0 4294967296"
958e1b
 
958e1b
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
958e1b
index 5bb18d0..b43e70f 100755
958e1b
--- a/tests/qemu-iotests/019
958e1b
+++ b/tests/qemu-iotests/019
958e1b
@@ -47,6 +47,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 TEST_OFFSETS="0 4294967296"
958e1b
 CLUSTER_SIZE=65536
958e1b
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
958e1b
index b3c86d8..73a0429 100755
958e1b
--- a/tests/qemu-iotests/020
958e1b
+++ b/tests/qemu-iotests/020
958e1b
@@ -45,6 +45,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 TEST_OFFSETS="0 4294967296"
958e1b
 
958e1b
diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
958e1b
index 67f1959..7349789 100755
958e1b
--- a/tests/qemu-iotests/034
958e1b
+++ b/tests/qemu-iotests/034
958e1b
@@ -41,6 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 CLUSTER_SIZE=4k
958e1b
 size=128M
958e1b
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
958e1b
index 743bae3..e444349 100755
958e1b
--- a/tests/qemu-iotests/037
958e1b
+++ b/tests/qemu-iotests/037
958e1b
@@ -41,6 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 CLUSTER_SIZE=4k
958e1b
 size=128M
958e1b
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
958e1b
index c8d92a0..9ef848b 100755
958e1b
--- a/tests/qemu-iotests/059
958e1b
+++ b/tests/qemu-iotests/059
958e1b
@@ -42,6 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt vmdk
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 capacity_offset=16
958e1b
 granularity_offset=20
958e1b
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
958e1b
index 2ab8f20..77503a2 100644
958e1b
--- a/tests/qemu-iotests/063
958e1b
+++ b/tests/qemu-iotests/063
958e1b
@@ -44,6 +44,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt qcow qcow2 vmdk qed raw
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" \
958e1b
+                     "subformat=twoGbMaxExtentFlat" \
958e1b
+                     "subformat=twoGbMaxExtentSparse"
958e1b
 
958e1b
 _make_test_img 4M
958e1b
 
958e1b
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
958e1b
index 3042803..50347d9 100755
958e1b
--- a/tests/qemu-iotests/069
958e1b
+++ b/tests/qemu-iotests/069
958e1b
@@ -41,6 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
958e1b
 _supported_fmt cow qed qcow qcow2 vmdk
958e1b
 _supported_proto generic
958e1b
 _supported_os Linux
958e1b
+_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
958e1b
 
958e1b
 IMG_SIZE=128K
958e1b
 
958e1b
-- 
958e1b
2.1.0
958e1b