On 30.03.2016 15:53, 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/039.out | 20 +++++++-------
> tests/qemu-iotests/common | 7 ++++-
> tests/qemu-iotests/common.config | 15 +++++++++--
> tests/qemu-iotests/common.rc | 57
> +++++++++++++++++++++++++++++-----------
> 4 files changed, 71 insertions(+), 28 deletions(-)
>
> diff --git a/tests/qemu-iotests/039.out b/tests/qemu-iotests/039.out
> index 32c8846..c6e0ac2 100644
> --- a/tests/qemu-iotests/039.out
> +++ b/tests/qemu-iotests/039.out
> @@ -12,9 +12,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ];
> then
> - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> else
> - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> fi )
> incompatible_features 0x1
> ERROR cluster 5 refcount=0 reference=1
> @@ -51,9 +51,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ];
> then
> - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> else
> - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> fi )
> incompatible_features 0x1
> ERROR cluster 5 refcount=0 reference=1
> @@ -69,9 +69,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ];
> then
> - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> else
> - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> fi )
> incompatible_features 0x0
> No errors were found on the image.
> @@ -92,9 +92,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ];
> then
> - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> else
> - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> fi )
> incompatible_features 0x1
> ERROR cluster 5 refcount=0 reference=1
> @@ -106,9 +106,9 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.config: Killed ( if [ "${VALGRIND_QEMU}" == "y" ];
> then
> - exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99
> "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> else
> - exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@";
> + exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
> fi )
> incompatible_features 0x0
> No errors were found on the image.I think 061 and 137 need the same treatment. Looks good apart from that. Max
signature.asc
Description: OpenPGP digital signature
