[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 29/37] block: Remove inner quotation marks in iotest
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 29/37] block: Remove inner quotation marks in iotest 085 |
Date: |
Thu, 5 Nov 2015 19:17:57 +0100 |
From: Alberto Garcia <address@hidden>
This patch removes the inner quotation marks in all cases like this:
cmd=" ... "${variable}" ... "
Signed-off-by: Alberto Garcia <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/qemu-iotests/085 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index 9484117..80e547d 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -65,7 +65,7 @@ function create_single_snapshot()
{
cmd="{ 'execute': 'blockdev-snapshot-sync',
'arguments': { 'device': 'virtio0',
-
'snapshot-file':'"${TEST_DIR}/${1}-${snapshot_virt0}"',
+
'snapshot-file':'${TEST_DIR}/${1}-${snapshot_virt0}',
'format': 'qcow2' } }"
_send_qemu_cmd $h "${cmd}" "return"
}
@@ -77,10 +77,10 @@ function create_group_snapshot()
{'actions': [
{ 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio0',
- 'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt0}"'
} },
+ 'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt0}' }
},
{ 'type': 'blockdev-snapshot-sync', 'data' :
{ 'device': 'virtio1',
- 'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_virt1}"'
} } ]
+ 'snapshot-file': '${TEST_DIR}/${1}-${snapshot_virt1}' }
} ]
} }"
_send_qemu_cmd $h "${cmd}" "return"
@@ -101,9 +101,9 @@ function add_snapshot_image()
mv "${TEST_IMG}" "${snapshot_file}"
cmd="{ 'execute': 'blockdev-add', 'arguments':
{ 'options':
- { 'driver': 'qcow2', 'node-name': 'snap_"${1}"', "${extra_params}"
+ { 'driver': 'qcow2', 'node-name': 'snap_${1}', ${extra_params}
'file':
- { 'driver': 'file', 'filename': '"${snapshot_file}"' } } } }"
+ { 'driver': 'file', 'filename': '${snapshot_file}' } } } }"
_send_qemu_cmd $h "${cmd}" "return"
}
@@ -113,7 +113,7 @@ function blockdev_snapshot()
{
cmd="{ 'execute': 'blockdev-snapshot',
'arguments': { 'node': 'virtio0',
- 'overlay':'snap_"${1}"' } }"
+ 'overlay':'snap_${1}' } }"
_send_qemu_cmd $h "${cmd}" "${2:-return}"
}
@@ -152,7 +152,7 @@ echo === Invalid command - missing device and nodename ===
echo
_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot-sync',
- 'arguments': {
'snapshot-file':'"${TEST_DIR}/1-${snapshot_virt0}"',
+ 'arguments': {
'snapshot-file':'${TEST_DIR}/1-${snapshot_virt0}',
'format': 'qcow2' } }" "error"
echo
@@ -224,7 +224,7 @@ blockdev_snapshot $((${SNAPSHOTS}+1)) error
_send_qemu_cmd $h "{ 'execute': 'blockdev-snapshot',
'arguments': { 'node':'nodevice',
- 'overlay':'snap_"${SNAPSHOTS}"' }
+ 'overlay':'snap_${SNAPSHOTS}' }
}" "error"
# success, all done
--
1.8.3.1
- [Qemu-devel] [PULL 22/37] commit: reopen overlay_bs before base, (continued)
- [Qemu-devel] [PULL 22/37] commit: reopen overlay_bs before base, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 21/37] block: add tests for the 'blockdev-snapshot' command, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 26/37] throttle: Check for pending requests in throttle_group_unregister_bs(), Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 23/37] qemu-iotests: Test the reopening of overlay_bs in 'block-commit', Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 25/37] qemu-img: add check for zero-length job len, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 24/37] qcow2: avoid misaligned 64bit bswap, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 27/37] throttle: Use bs->throttle_state instead of bs->io_limits_enabled, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 20/37] block: add a 'blockdev-snapshot' QMP command, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 16/37] iotests: Add test for change-related QMP commands, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 28/37] block: Disallow snapshots if the overlay doesn't support backing files, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 29/37] block: Remove inner quotation marks in iotest 085,
Kevin Wolf <=
- [Qemu-devel] [PULL 34/37] block: Add blk_get_refcnt(), Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 31/37] qemu-iotests: fix cleanup of background processes, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 30/37] block: test 'blockdev-snapshot' using a file BDS as the overlay, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 32/37] qemu-iotests: fix -valgrind option for check, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 33/37] mirror: block all operations on the target image during the job, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 35/37] block: Add 'x-blockdev-del' QMP command, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 36/37] iotests: Add tests for the x-blockdev-del command, Kevin Wolf, 2015/11/05
- [Qemu-devel] [PULL 37/37] qcow2: Fix qcow2_get_cluster_offset() for zero clusters, Kevin Wolf, 2015/11/05
- Re: [Qemu-devel] [PULL 00/37] Block layer patches, Peter Maydell, 2015/11/05