On 09/05/2019 18.59, Alex Bennée wrote: > This attempts to clean-up the output to better match the output of the > rest of the QEMU check system. This includes: > > - formatting as " TEST iotest: nnn" > - calculating time diff at the end > - only dumping config on failure > > Signed-off-by: Alex Bennée <alex.ben...@linaro.org> > Message-Id: <20190503143904.31211-1-alex.ben...@linaro.org> > --- > tests/qemu-iotests/check | 101 +++++++++++++++++++++++---------------- > 1 file changed, 61 insertions(+), 40 deletions(-) [...] > -cat <<EOF > -QEMU -- "$QEMU_PROG" $QEMU_OPTIONS > -QEMU_IMG -- "$QEMU_IMG_PROG" $QEMU_IMG_OPTIONS > -QEMU_IO -- "$QEMU_IO_PROG" $QEMU_IO_OPTIONS > -QEMU_NBD -- "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS > -IMGFMT -- $FULL_IMGFMT_DETAILS > -IMGPROTO -- $IMGPROTO > -PLATFORM -- $FULL_HOST_DETAILS > -TEST_DIR -- $TEST_DIR > -SOCKET_SCM_HELPER -- $SOCKET_SCM_HELPER > - > -EOF > +if ! $pretty; then > + _full_env_details > +fi > > seq="check" [...] > @@ -852,9 +869,13 @@ do > # > if $err > then > + _report_test_result $seq "FAILED $reason" > + _full_env_details
I'd suggest to wrap the _full_env_details with a "if $pretty" statement, otherwise the env will be printed out twice, one time at the beginning, and one time in case of an error. > bad="$bad $seq" > n_bad=$(expr $n_bad + 1) > quick=false > + else > + _report_test_result $seq "$results" > fi > [ -f $seq.notrun ] || try=$(expr $try + 1) > > Thomas