On 2/19/19 10:13 AM, Daniel P. Berrangé wrote:
> If we abort the iotest early the server.log file might contain useful
> information for diagnosing the problem. Ensure its contents are
> displayed in this case.
>
> Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
> tests/qemu-iotests/233 | 3 +++
> 1 file changed, 3 insertions(+)
Reviewed-by: Eric Blake <ebl...@redhat.com>
>
> diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
> index fc345a1a46..27932df075 100755
> --- a/tests/qemu-iotests/233
> +++ b/tests/qemu-iotests/233
> @@ -30,6 +30,8 @@ _cleanup()
> {
> nbd_server_stop
> _cleanup_test_img
> + # If we aborted early we want to see this log for diagnosis
> + test -f "$TEST_DIR/server.log" && cat "$TEST_DIR/server.log"
> rm -f "$TEST_DIR/server.log"
> tls_x509_cleanup
> }
> @@ -120,6 +122,7 @@ $QEMU_IO -f $IMGFMT -r -U -c 'r -P 0x22 1m 1m'
> "$TEST_IMG" | _filter_qemu_io
> echo
> echo "== final server log =="
> cat "$TEST_DIR/server.log"
> +rm -f $TEST_DIR/server.log
>
> # success, all done
> echo "*** done"
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
