diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-09-02 20:52:27 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-09-04 20:59:48 +0200 |
| commit | 934659c460d46c948cf348822fda1d38556ed9a4 (patch) | |
| tree | b70041c609aea9532ccc395ebe2cf345f15a9580 /tests/qemu-iotests/common.config | |
| parent | 0ed82f7a096537923ef3705946f254d2f61eaf93 (diff) | |
| download | qemu-934659c460d46c948cf348822fda1d38556ed9a4.zip | |
iotests: Do not suppress segfaults in bash tests
Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a
segmentation fault, that message is invisible in most cases since the
output is generally filtered and bash suppresses the segmentation fault
notice for any but the last element of a pipe.
Most of the time, the test will then fail anyway because of missing
output, but not necessarily (as happened with test 82 recently).
Fix this by making the corresponding environment variables point to
wrapper functions which execute the respective command in a subshell.
Giving options to qemu/qemu-io/qemu-img and path names with spaces were
broken for the Python tests; this patch "accidentally" fixes that.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/common.config')
| -rw-r--r-- | tests/qemu-iotests/common.config | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config index e0bf896e46..596bb2b1e5 100644 --- a/tests/qemu-iotests/common.config +++ b/tests/qemu-iotests/common.config @@ -103,10 +103,31 @@ if [ -z "$QEMU_NBD_PROG" ]; then export QEMU_NBD_PROG="`set_prog_path qemu-nbd`" fi -export QEMU="$QEMU_PROG $QEMU_OPTIONS" -export QEMU_IMG=$QEMU_IMG_PROG -export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS" -export QEMU_NBD=$QEMU_NBD_PROG +_qemu_wrapper() +{ + (exec "$QEMU_PROG" $QEMU_OPTIONS "$@") +} + +_qemu_img_wrapper() +{ + (exec "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS "$@") +} + +_qemu_io_wrapper() +{ + (exec "$QEMU_IO_PROG" $QEMU_IO_OPTIONS "$@") +} + +_qemu_nbd_wrapper() +{ + (exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@") +} + +export QEMU=_qemu_wrapper +export QEMU_IMG=_qemu_img_wrapper +export QEMU_IO=_qemu_io_wrapper +export QEMU_NBD=_qemu_nbd_wrapper + default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}') default_alias_machine=$($QEMU -machine \? |\ awk -v var_default_machine="$default_machine"\)\ |