|
 |
383d26 |
From 7ccfbb9865064e0b41b6acf9e451c6c1471fe86e Mon Sep 17 00:00:00 2001
|
|
|
383d26 |
From: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Date: Wed, 20 Mar 2019 16:16:28 +0100
|
|
|
383d26 |
Subject: [PATCH 030/163] iotests: Fix 232 for LUKS
|
|
|
383d26 |
|
|
|
383d26 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: <20190320161631.14841-17-jsnow@redhat.com>
|
|
|
383d26 |
Patchwork-id: 84955
|
|
|
383d26 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 16/19] iotests: Fix 232 for LUKS
|
|
|
383d26 |
Bugzilla: 1668956
|
|
|
383d26 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
383d26 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
|
|
|
383d26 |
With IMGOPTSSYNTAX, $TEST_IMG is useless for this test (it only tests
|
|
|
383d26 |
the file-posix protocol driver). Therefore, if $TEST_IMG_FILE is set,
|
|
|
383d26 |
use that instead.
|
|
|
383d26 |
|
|
|
383d26 |
Because this test requires the file protocol, $TEST_IMG_FILE will always
|
|
|
383d26 |
be set if $IMGOPTSSYNTAX is true.
|
|
|
383d26 |
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Message-id: 20190210145736.1486-5-mreitz@redhat.com
|
|
|
383d26 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
383d26 |
(cherry picked from commit c48221aa91d9078b86e23b19484227dc35d71840)
|
|
|
383d26 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
383d26 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
383d26 |
---
|
|
|
383d26 |
tests/qemu-iotests/232 | 4 ++++
|
|
|
383d26 |
1 file changed, 4 insertions(+)
|
|
|
383d26 |
|
|
|
383d26 |
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
|
|
|
383d26 |
index de884cd..2ed39d2 100755
|
|
|
383d26 |
--- a/tests/qemu-iotests/232
|
|
|
383d26 |
+++ b/tests/qemu-iotests/232
|
|
|
383d26 |
@@ -70,6 +70,10 @@ size=128M
|
|
|
383d26 |
|
|
|
383d26 |
_make_test_img $size
|
|
|
383d26 |
|
|
|
383d26 |
+if [ -n "$TEST_IMG_FILE" ]; then
|
|
|
383d26 |
+ TEST_IMG=$TEST_IMG_FILE
|
|
|
383d26 |
+fi
|
|
|
383d26 |
+
|
|
|
383d26 |
echo
|
|
|
383d26 |
echo "=== -drive with read-write image: read-only/auto-read-only combinations ==="
|
|
|
383d26 |
echo
|
|
|
383d26 |
--
|
|
|
383d26 |
1.8.3.1
|
|
|
383d26 |
|