On Fri, Feb 22, 2019 at 04:06:32PM +0100, Max Reitz wrote:
> On 20.02.19 15:58, 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.
> >
> > Reviewed-by: Eric Blake <ebl...@redhat.com>
> > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> > ---
> > tests/qemu-iotests/233 | 3 +++
> > 1 file changed, 3 insertions(+)
> >
> > 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
>
> I'm not sure how well the iotests currently cope with spaced dir names
> anyway, but it looks weird to not use quotes here right after a line
> that does.
Yes, that is a mistake since we tried quoting throughout the file
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
