aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests/117.out
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2020-12-17 16:38:03 +0100
committerMax Reitz <mreitz@redhat.com>2020-12-18 12:47:38 +0100
commit0e72078128229bf9efb542e396ab44bf91b91340 (patch)
tree297f8b8b943c389a1986f94ea5255ab47aa6e924 /tests/qemu-iotests/117.out
parent0c8fbfb91536cd1505a2af88912e8e854d29fab0 (diff)
downloadqemu-0e72078128229bf9efb542e396ab44bf91b91340.zip
qemu-0e72078128229bf9efb542e396ab44bf91b91340.tar.gz
qemu-0e72078128229bf9efb542e396ab44bf91b91340.tar.bz2
iotests: Fix _send_qemu_cmd with bash 5.1
With bash 5.1, the output of the following script changes: a=("double space") a=${a[@]:0:1} echo "$a" from "double space" to "double space", i.e. all white space is preserved as-is. This is probably what we actually want here (judging from the "...to accommodate pathnames with spaces" comment), but before 5.1, we would have to quote the ${} slice to get the same behavior. In any case, without quoting, the reference output of many iotests is different between bash 5.1 and pre-5.1, which is not very good. The output of 5.1 is what we want, so whatever we do to get pre-5.1 to the same result, it means we have to fix the reference output of basically all tests that invoke _send_qemu_cmd (except the ones that only use single spaces in the commands they invoke). Instead of quoting the ${} slice (cmd="${$@: 1:...}"), we can also just not use array slicing and replace the whole thing with a simple "cmd=$1; shift", which works because all callers quote the whole $cmd argument anyway. Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <20201217153803.101231-3-mreitz@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/117.out')
-rw-r--r--tests/qemu-iotests/117.out13
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/qemu-iotests/117.out b/tests/qemu-iotests/117.out
index bb623dc..735ffd2 100644
--- a/tests/qemu-iotests/117.out
+++ b/tests/qemu-iotests/117.out
@@ -2,11 +2,18 @@ QA output created by 117
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=65536
{ 'execute': 'qmp_capabilities' }
{"return": {}}
-{ 'execute': 'blockdev-add', 'arguments': { 'node-name': 'protocol', 'driver': 'file', 'filename': 'TEST_DIR/t.IMGFMT' } }
+{ 'execute': 'blockdev-add',
+ 'arguments': { 'node-name': 'protocol',
+ 'driver': 'file',
+ 'filename': 'TEST_DIR/t.IMGFMT' } }
{"return": {}}
-{ 'execute': 'blockdev-add', 'arguments': { 'node-name': 'format', 'driver': 'IMGFMT', 'file': 'protocol' } }
+{ 'execute': 'blockdev-add',
+ 'arguments': { 'node-name': 'format',
+ 'driver': 'IMGFMT',
+ 'file': 'protocol' } }
{"return": {}}
-{ 'execute': 'human-monitor-command', 'arguments': { 'command-line': 'qemu-io format "write -P 42 0 64k"' } }
+{ 'execute': 'human-monitor-command',
+ 'arguments': { 'command-line': 'qemu-io format "write -P 42 0 64k"' } }
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": ""}