On 21.03.2016 15:11, Daniel P. Berrange wrote: > Currently all block tests use the traditional syntax for images > just specifying a filename. To support the LUKS driver without > resorting to JSON, the tests need to be able to use the new > --image-opts argument to qemu-img and qemu-io. > > This introduces a new env variable IMGOPTSSYNTAX. If this is > set to 'true', then qemu-img/qemu-io should use --image-opts. > > Signed-off-by: Daniel P. Berrange <berra...@redhat.com> > --- > tests/qemu-iotests/common | 7 ++++- > tests/qemu-iotests/common.config | 15 +++++++++-- > tests/qemu-iotests/common.rc | 58 > +++++++++++++++++++++++++++++----------- > 3 files changed, 62 insertions(+), 18 deletions(-) >
[...]
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index d9913f8..5eb654b 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -53,21 +53,43 @@ fi
> # make sure we have a standard umask
> umask 022
>
> -if [ "$IMGPROTO" = "file" ]; then
> - TEST_IMG=$TEST_DIR/t.$IMGFMT
> -elif [ "$IMGPROTO" = "nbd" ]; then
> - TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> - TEST_IMG="nbd:127.0.0.1:10810"
> -elif [ "$IMGPROTO" = "ssh" ]; then
> - TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> - TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
> -elif [ "$IMGPROTO" = "nfs" ]; then
> - TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
> - TEST_IMG=$TEST_DIR/t.$IMGFMT
> -elif [ "$IMGPROTO" = "archipelago" ]; then
> - TEST_IMG="archipelago:at.$IMGFMT"
> +if [ "$IMGOPTSSYNTAX" = "true" ]; then
> + DRIVER="driver=$IMGFMT"
> + if [ "$IMGPROTO" = "file" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> + TEST_IMG="$DRIVER,file.filename=$TEST_DIR/t.$IMGFMT"
> + elif [ "$IMGPROTO" = "nbd" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> +
> TEST_IMG="$DRIVER,file.driver=nbd,file.host=127.0.0.1,file.port=10810"
> + elif [ "$IMGPROTO" = "ssh" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> +
> TEST_IMG="$DRIVER,file.driver=ssh,file.host=127.0.0.1,file.path=$TEST_IMG_FILE"
> + elif [ "$IMGPROTO" = "nfs" ]; then
> +
> TEST_DIR="$DRIVER,file.driver=nfs,file.filename=nfs://127.0.0.1/$TEST_DIR"
> + TEST_IMG=$TEST_DIR_OPTS/t.$IMGFMT
> + elif [ "$IMGPROTO" = "archipelago" ]; then
> + TEST_IMG="$DRIVER,file.driver=archipelago,file.volume=:at.$IMGFMT"
> + else
> +
> TEST_IMG="$DRIVER,file.driver=$IMGPROTO,file.filename=$TEST_DIR/t.$IMGFMT"
> + fi
> else
> - TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
> + if [ "$IMGPROTO" = "file" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
This wasn't set before (in this case). Doing so breaks many qcow2+file
tests (28, to be exact), because they rely on being able to do something
like
TEST_IMG="${TEST_IMG}.base" _make_test_img
which fails now because _make_test_img resorts to TEST_IMG_FILE.
I guess the fix would be for them to use TEST_IMG_FILE in those places
instead of TEST_IMG; but it's not always so simple. For instance, test
017 sets TEST_IMG and then relies on the io() function provided by
common.pattern to use that image, so maybe 017 would need to set both
TEST_IMG and TEST_IMG_FILE.
Max
> + TEST_IMG=$TEST_DIR/t.$IMGFMT
> + elif [ "$IMGPROTO" = "nbd" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> + TEST_IMG="nbd:127.0.0.1:10810"
> + elif [ "$IMGPROTO" = "ssh" ]; then
> + TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
> + TEST_IMG="ssh://127.0.0.1$TEST_IMG_FILE"
> + elif [ "$IMGPROTO" = "nfs" ]; then
> + TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
> + TEST_IMG=$TEST_DIR/t.$IMGFMT
> + elif [ "$IMGPROTO" = "archipelago" ]; then
> + TEST_IMG="archipelago:at.$IMGFMT"
> + else
> + TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
> + fi
> fi
>
> _optstr_add()
signature.asc
Description: OpenPGP digital signature
