Commit d1f2447a authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Kevin Wolf
Browse files

qemu-iotests: limit non-_PROG-suffixed variables to common.rc 



These are never used by "check", with one exception that does not need
$QEMU_OPTIONS.  Keep them in common.rc, which will be soon included only
by the tests.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent cceaf1db

tests/qemu-iotests/039.out

+5 −5
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ No errors were found on the image. 
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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
@@ -50,7 +50,7 @@ read 512/512 bytes at offset 0 
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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
@@ -68,7 +68,7 @@ incompatible_features 0x0 
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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
@@ -91,7 +91,7 @@ No errors were found on the image. 
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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
@@ -105,7 +105,7 @@ Data may be corrupted, or further writes to the image may corrupt it. 
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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

tests/qemu-iotests/061.out

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ No errors were found on the image. 
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

wrote 131072/131072 bytes at offset 0

128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

./common.config: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";
@@ -219,7 +219,7 @@ No errors were found on the image. 
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864

wrote 131072/131072 bytes at offset 0

128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)

./common.config: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

tests/qemu-iotests/137.out

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Cache clean interval too big 
Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all

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

./common.rc: Killed                  ( if [ "${VALGRIND_QEMU}" == "y" ]; then

    exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

else

    exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@";

tests/qemu-iotests/common.config

+2 −67
Original line number Diff line number Diff line
@@ -40,71 +40,6 @@ _optstr_add() 
    fi

}



_qemu_wrapper()

{

    (

        if [ -n "${QEMU_NEED_PID}" ]; then

            echo $BASHPID > "${QEMU_TEST_DIR}/qemu-${_QEMU_HANDLE}.pid"

        fi

        exec "$QEMU_PROG" $QEMU_OPTIONS "$@"

    )

}



_qemu_img_wrapper()

{

    (exec "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS "$@")

}



_qemu_io_wrapper()

{

    local VALGRIND_LOGFILE="${TEST_DIR}"/$$.valgrind

    local QEMU_IO_ARGS="$QEMU_IO_OPTIONS"

    if [ "$IMGOPTSSYNTAX" = "true" ]; then

        QEMU_IO_ARGS="--image-opts $QEMU_IO_ARGS"

        if [ -n "$IMGKEYSECRET" ]; then

            QEMU_IO_ARGS="--object secret,id=keysec0,data=$IMGKEYSECRET $QEMU_IO_ARGS"

        fi

    fi

    local RETVAL

    (

        if [ "${VALGRIND_QEMU}" == "y" ]; then

            exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"

        else

            exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"

        fi

    )

    RETVAL=$?

    if [ "${VALGRIND_QEMU}" == "y" ]; then

        if [ $RETVAL == 99 ]; then

            cat "${VALGRIND_LOGFILE}"

        fi

        rm -f "${VALGRIND_LOGFILE}"

    fi

    (exit $RETVAL)

}



_qemu_nbd_wrapper()

{

    (

        echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid"

        exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@"

    )

}



_qemu_vxhs_wrapper()

{

    (

        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"

        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"

    )

}



export QEMU=_qemu_wrapper

export QEMU_IMG=_qemu_img_wrapper

export QEMU_IO=_qemu_io_wrapper

export QEMU_NBD=_qemu_nbd_wrapper

export QEMU_VXHS=_qemu_vxhs_wrapper



QEMU_IMG_EXTRA_ARGS=

if [ "$IMGOPTSSYNTAX" = "true" ]; then

    QEMU_IMG_EXTRA_ARGS="--image-opts $QEMU_IMG_EXTRA_ARGS"
@@ -115,8 +50,8 @@ fi 
export QEMU_IMG_EXTRA_ARGS





default_machine=$($QEMU -machine help | sed -n '/(default)/ s/ .*//p')

default_alias_machine=$($QEMU -machine help | \

default_machine=$($QEMU_PROG -machine help | sed -n '/(default)/ s/ .*//p')

default_alias_machine=$($QEMU_PROG -machine help | \

   sed -n "/(alias of $default_machine)/ { s/ .*//p; q; }")

if [[ "$default_alias_machine" ]]; then

    default_machine="$default_alias_machine"

tests/qemu-iotests/common.rc

+65 −0
Original line number Diff line number Diff line
@@ -50,6 +50,71 @@ then 
    fi

fi



_qemu_wrapper()

{

    (

        if [ -n "${QEMU_NEED_PID}" ]; then

            echo $BASHPID > "${QEMU_TEST_DIR}/qemu-${_QEMU_HANDLE}.pid"

        fi

        exec "$QEMU_PROG" $QEMU_OPTIONS "$@"

    )

}



_qemu_img_wrapper()

{

    (exec "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS "$@")

}



_qemu_io_wrapper()

{

    local VALGRIND_LOGFILE="${TEST_DIR}"/$$.valgrind

    local QEMU_IO_ARGS="$QEMU_IO_OPTIONS"

    if [ "$IMGOPTSSYNTAX" = "true" ]; then

        QEMU_IO_ARGS="--image-opts $QEMU_IO_ARGS"

        if [ -n "$IMGKEYSECRET" ]; then

            QEMU_IO_ARGS="--object secret,id=keysec0,data=$IMGKEYSECRET $QEMU_IO_ARGS"

        fi

    fi

    local RETVAL

    (

        if [ "${VALGRIND_QEMU}" == "y" ]; then

            exec valgrind --log-file="${VALGRIND_LOGFILE}" --error-exitcode=99 "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"

        else

            exec "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@"

        fi

    )

    RETVAL=$?

    if [ "${VALGRIND_QEMU}" == "y" ]; then

        if [ $RETVAL == 99 ]; then

            cat "${VALGRIND_LOGFILE}"

        fi

        rm -f "${VALGRIND_LOGFILE}"

    fi

    (exit $RETVAL)

}



_qemu_nbd_wrapper()

{

    (

        echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid"

        exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@"

    )

}



_qemu_vxhs_wrapper()

{

    (

        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"

        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"

    )

}



export QEMU=_qemu_wrapper

export QEMU_IMG=_qemu_img_wrapper

export QEMU_IO=_qemu_io_wrapper

export QEMU_NBD=_qemu_nbd_wrapper

export QEMU_VXHS=_qemu_vxhs_wrapper



if [ "$IMGOPTSSYNTAX" = "true" ]; then

    DRIVER="driver=$IMGFMT"

    if [ "$IMGFMT" = "luks" ]; then