|
 |
0a122b |
From 37f496947f6acfc92c7a2d62925b0a8a1ed71a82 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Date: Wed, 20 Nov 2013 19:43:48 +0100
|
|
|
0a122b |
Subject: [PATCH 05/25] block: qemu-iotests, add quotes to $TEST_IMG usage in 019
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Jeffrey Cody <jcody@redhat.com>
|
|
|
0a122b |
Message-id: <5e5cffb85c88a8d5b3d77ac793f8c12f17c12741.1384975172.git.jcody@redhat.com>
|
|
|
0a122b |
Patchwork-id: 55798
|
|
|
0a122b |
O-Subject: [RHEL7 qemu-kvm PATCH 05/26] block: qemu-iotests, add quotes to $TEST_IMG usage in 019
|
|
|
0a122b |
Bugzilla: 879234
|
|
|
0a122b |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
There were still instances of $TEST_IMG not being properly quoted.
|
|
|
0a122b |
This was in the usage of a string built up for a 'for' loop; modify
|
|
|
0a122b |
the loop so we can quote $TEST_IMG properly.
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Jeff Cody <jcody@redhat.com>
|
|
|
0a122b |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
0a122b |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
0a122b |
(cherry picked from commit 3cbe3e8d25529ecb4e1838d1c6856e199b3a66d4)
|
|
|
0a122b |
---
|
|
|
0a122b |
tests/qemu-iotests/019 | 6 +++---
|
|
|
0a122b |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
tests/qemu-iotests/019 | 6 +++---
|
|
|
0a122b |
1 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
|
|
|
0a122b |
index cd3582c..5bb18d0 100755
|
|
|
0a122b |
--- a/tests/qemu-iotests/019
|
|
|
0a122b |
+++ b/tests/qemu-iotests/019
|
|
|
0a122b |
@@ -90,12 +90,12 @@ mv "$TEST_IMG" "$TEST_IMG.orig"
|
|
|
0a122b |
# Test the conversion twice: One test with the old-style -B option and another
|
|
|
0a122b |
# one with -o backing_file
|
|
|
0a122b |
|
|
|
0a122b |
-for backing_option in "-B $TEST_IMG.base" "-o backing_file=$TEST_IMG.base"; do
|
|
|
0a122b |
+for backing_option in "-B " "-o backing_file="; do
|
|
|
0a122b |
|
|
|
0a122b |
echo
|
|
|
0a122b |
- echo Testing conversion with $backing_option | _filter_testdir | _filter_imgfmt
|
|
|
0a122b |
+ echo Testing conversion with $backing_option$TEST_IMG.base | _filter_testdir | _filter_imgfmt
|
|
|
0a122b |
echo
|
|
|
0a122b |
- $QEMU_IMG convert -O $IMGFMT $backing_option "$TEST_IMG.orig" "$TEST_IMG"
|
|
|
0a122b |
+ $QEMU_IMG convert -O $IMGFMT $backing_option"$TEST_IMG.base" "$TEST_IMG.orig" "$TEST_IMG"
|
|
|
0a122b |
|
|
|
0a122b |
echo "Checking if backing clusters are allocated when they shouldn't"
|
|
|
0a122b |
echo
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|