|
 |
357786 |
From 1ed06a7c22bbae0f9e17147c86ad2ecc69efb9bf Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Date: Wed, 1 Aug 2018 06:35:38 +0200
|
|
|
357786 |
Subject: [PATCH 02/13] iotests: Add test for 'qemu-img convert -C'
|
|
|
357786 |
compatibility
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Message-id: <20180801063538.32582-3-famz@redhat.com>
|
|
|
357786 |
Patchwork-id: 81562
|
|
|
357786 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 2/2] iotests: Add test for 'qemu-img convert -C' compatibility
|
|
|
357786 |
Bugzilla: 1607774
|
|
|
357786 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
(cherry picked from commit 8ba4f10fa689251facd483c3ee0ef4dd4e9bec53)
|
|
|
357786 |
Signed-off-by: Fam Zheng <famz@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
tests/qemu-iotests/082 | 8 ++++++++
|
|
|
357786 |
tests/qemu-iotests/082.out | 11 +++++++++++
|
|
|
357786 |
2 files changed, 19 insertions(+)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
|
|
|
357786 |
index a872f77..3e605d5 100755
|
|
|
357786 |
--- a/tests/qemu-iotests/082
|
|
|
357786 |
+++ b/tests/qemu-iotests/082
|
|
|
357786 |
@@ -158,6 +158,14 @@ run_qemu_img convert -o help
|
|
|
357786 |
run_qemu_img convert -O bochs -o help
|
|
|
357786 |
|
|
|
357786 |
echo
|
|
|
357786 |
+echo === convert: -C and other options ===
|
|
|
357786 |
+
|
|
|
357786 |
+# Adding the help option to a command without other -o options
|
|
|
357786 |
+run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
|
|
|
357786 |
+run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
|
|
|
357786 |
+run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
|
|
|
357786 |
+
|
|
|
357786 |
+echo
|
|
|
357786 |
echo === amend: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
# Last -f should win
|
|
|
357786 |
diff --git a/tests/qemu-iotests/082.out b/tests/qemu-iotests/082.out
|
|
|
357786 |
index 60ef87c..19e9fb1 100644
|
|
|
357786 |
--- a/tests/qemu-iotests/082.out
|
|
|
357786 |
+++ b/tests/qemu-iotests/082.out
|
|
|
357786 |
@@ -508,6 +508,17 @@ size Virtual disk size
|
|
|
357786 |
Testing: convert -O bochs -o help
|
|
|
357786 |
qemu-img: Format driver 'bochs' does not support image creation
|
|
|
357786 |
|
|
|
357786 |
+=== convert: -C and other options ===
|
|
|
357786 |
+
|
|
|
357786 |
+Testing: convert -C -S 4k -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
|
|
|
357786 |
+qemu-img: Cannot enable copy offloading when -S is used
|
|
|
357786 |
+
|
|
|
357786 |
+Testing: convert -C -S 8k -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
|
|
|
357786 |
+qemu-img: Cannot enable copy offloading when -S is used
|
|
|
357786 |
+
|
|
|
357786 |
+Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
|
|
|
357786 |
+qemu-img: Cannot enable copy offloading when -c is used
|
|
|
357786 |
+
|
|
|
357786 |
=== amend: Options specified more than once ===
|
|
|
357786 |
|
|
|
357786 |
Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|