mirror of https://github.com/proxmox/mirror_qemu
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>master
parent
f394f1feb9
commit
21af814887
|
@ -57,16 +57,21 @@ _make_test_img()
|
||||||
{
|
{
|
||||||
# extra qemu-img options can be added by tests
|
# extra qemu-img options can be added by tests
|
||||||
# at least one argument (the image size) needs to be added
|
# 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 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
|
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
|
||||||
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
|
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
|
||||||
cluster_size_filter=""
|
cluster_size_filter=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# XXX(hch): have global image options?
|
# 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#$IMGPROTO:$TEST_DIR#TEST_DIR#g" | \
|
||||||
sed -e "s#$TEST_DIR#TEST_DIR#g" | \
|
sed -e "s#$TEST_DIR#TEST_DIR#g" | \
|
||||||
sed -e "s#$IMGFMT#IMGFMT#g" | \
|
sed -e "s#$IMGFMT#IMGFMT#g" | \
|
||||||
|
|
Loading…
Reference in New Issue