qemu-iotests: Fix call syntax for qemu-io

qemu-io requires options first, then fixed parameters.

GNU getopt also allows options at the end, but POSIX getopt
doesn't. Try "export POSIXLY_CORRECT=y" to get the POSIX
behaviour with GNU getopt, too.

Cc: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index f7262b57bf8f243b8a064c10609957c14526e72c..25368c819b31cb10f02d6ab5a111cd0bebe7dcdc 100755 (executable)
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -53,10 +53,10 @@ _make_test_img $size
 echo
 echo "creating pattern"
 $QEMU_IO \
-       -c "write 2048k 4k -P 65" \
+       -c "write -P 65 2048k 4k" \
        -c "write 4k 4k" \
        -c "write 9M 4k" \
-       -c "read 2044k 8k -P 65 -s 4k -l 4k" \
+       -c "read -P 65 -s 4k -l 4k 2044k 8k" \
 $TEST_IMG | _filter_qemu_io
 
 echo

diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index e3205aa20603055d39382faa06a8f3c3bbebbb26..7b5792934ab8dd72596d81fdb317b9d459554b91 100755 (executable)
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -53,11 +53,11 @@ _make_test_img $size
 echo
 echo "creating pattern"
 $QEMU_IO \
-       -c "write 2048k 4k -P 165" \
+       -c "write -P 165 2048k 4k" \
        -c "write 64k 4k" \
        -c "write 9M 4k" \
-       -c "write 2044k 4k -P 165" \
-       -c "write 8M 4k -P 99" \
+       -c "write -P 165 2044k 4k" \
+       -c "write -P 99 8M 4k" \
        -c "read -P 165 2044k 8k" \
 $TEST_IMG | _filter_qemu_io
 

diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index 59df1ae48e87425499606f5570acbf6bfbbf8c5e..b03df6887d1aabfd916aeeb23ada2dc0641667de 100755 (executable)
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -60,7 +60,7 @@ for i in `seq 1 10`; do
     # Note that we filter away the actual offset.  That's because qemu
     # may re-order the two aio requests.  We only want to make sure the
     # filesystem isn't corrupted afterwards anyway.
-    $QEMU_IO $TEST_IMG -c "aio_write $off1 1M" -c "aio_write $off2 1M" | \
+    $QEMU_IO -c "aio_write $off1 1M" -c "aio_write $off2 1M" $TEST_IMG | \
        _filter_qemu_io | \
        sed -e 's/bytes at offset [0-9]*/bytes at offset XXX/g'
 done