diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-03-14 19:57:23 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-04-05 15:08:22 +0200 |
| commit | 21af81488799e2290cb2e58eb2a91d1d8044ebc4 (patch) | |
| tree | 30a5e8105853b8bee3a6e85c15383db7e42a6c92 /tests/qemu-iotests | |
| parent | f394f1feb921d5a4b278e7ac95bdaa49e34a52f2 (diff) | |
| download | qemu-21af81488799e2290cb2e58eb2a91d1d8044ebc4.zip qemu-21af81488799e2290cb2e58eb2a91d1d8044ebc4.tar.gz qemu-21af81488799e2290cb2e58eb2a91d1d8044ebc4.tar.bz2 | |
qemu-iotests: Fix call syntax for qemu-img
qemu-img requires first options, then file name, then size.
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>
Diffstat (limited to 'tests/qemu-iotests')
| -rw-r--r-- | tests/qemu-iotests/common.rc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc index 26811ca..4cb8dae 100644 --- a/tests/qemu-iotests/common.rc +++ b/tests/qemu-iotests/common.rc @@ -57,16 +57,21 @@ _make_test_img() { # extra qemu-img options can be added by tests # at least one argument (the image size) needs to be added - local extra_img_options=$* + local extra_img_options="" local cluster_size_filter="s# cluster_size=[0-9]\\+##g" + local image_size=$* + if [ "$1" = "-b" ]; then + extra_img_options="$1 $2" + image_size=$3 + fi if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options" cluster_size_filter="" fi # XXX(hch): have global image options? - $QEMU_IMG create -f $IMGFMT $TEST_IMG $extra_img_options | \ + $QEMU_IMG create -f $IMGFMT $extra_img_options $TEST_IMG $image_size | \ sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" | \ sed -e "s#$TEST_DIR#TEST_DIR#g" | \ sed -e "s#$IMGFMT#IMGFMT#g" | \ |