Max Reitz <mre...@redhat.com> writes:
> On 23.05.19 12:25, Alex Bennée wrote: >> This attempts to clean-up the output to better match the output of the >> rest of the QEMU check system when called with -makecheck. This includes: >> >> - formatting as " TEST iotest-FMT: nnn" >> - only dumping config on failure (when -makecheck enabled) >> >> The non-make check output has been cleaned up as well: >> >> - line re-displayed (\r) at the end >> - fancy colours for pass/fail/skip >> - timestamps always printed (option removed) >> >> Signed-off-by: Alex Bennée <alex.ben...@linaro.org> >> Message-Id: <20190503143904.31211-1-alex.ben...@linaro.org> >> Tested-by: Thomas Huth <th...@redhat.com> >> >> --- >> v3 >> - revert echo to printf >> - add _report_test_start >> v4 >> - -pretty -> -makecheck >> - keep all output together for makecheck >> v5 >> - merged in kwolf's pretty printing >> - timestamps always printed in non-makecheck mode >> --- >> tests/qemu-iotests/check | 179 +++++++++++++++++++++++++-------------- >> 1 file changed, 116 insertions(+), 63 deletions(-) > > Unless I missed something, this breaks ./check: > > $ ./check -T -qcow2 > 000 - unknown test, ignored Because -T has been dropped (timestamps are always shown). Of course removing from the opts passing falls through. Should I just do: modified tests/qemu-iotests/check @@ -433,6 +433,11 @@ testlist options cachemode=true xpand=false ;; + -T) + echo "-T no longer needed" + exit -1 + ;; + -v) verbose=true > QEMU -- "build/x86_64-softmmu/qemu-system-x86_64" -nodefaults > -machine accel=qtest > QEMU_IMG -- "build/qemu-img" > QEMU_IO -- "build/qemu-io" --cache writeback -f qcow2 > QEMU_NBD -- "build/qemu-nbd" > IMGFMT -- qcow2 (compat=1.1) > IMGPROTO -- file > PLATFORM -- Linux/x86_64 dresden 5.0.14-300.fc30.x86_64 > TEST_DIR -- build/tests/qemu-iotests/scratch > SOCKET_SCM_HELPER -- build/tests/qemu-iotests/socket_scm_helper > > Passed all 0 tests > > > Max -- Alex Bennée