[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/46] mtest2make: hide output of successful tests
From: |
Paolo Bonzini |
Subject: |
[PULL 06/46] mtest2make: hide output of successful tests |
Date: |
Fri, 4 Sep 2020 07:40:42 -0400 |
The softfloat tests are quite noisy; before the Meson conversion
they buffered the output in a file and emitted the output only
if the test failed. Tweak mtest2make.py so that the courtesy
is extended to all non-TAP tests.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
scripts/mtest2make.py | 2 +-
scripts/test-driver.py | 35 +++++++++++++++++++++++++++++++++++
2 files changed, 36 insertions(+), 1 deletion(-)
create mode 100644 scripts/test-driver.py
diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py
index c709b37f28..27425080cf 100644
--- a/scripts/mtest2make.py
+++ b/scripts/mtest2make.py
@@ -21,7 +21,7 @@ SPEED = quick
# $1 = environment, $2 = test command, $3 = test name, $4 = dir
.test-human-tap = $1 $(if $4,(cd $4 && $2),$2) < /dev/null |
./scripts/tap-driver.pl --test-name="$3" $(if $(V),,--show-failures-only)
-.test-human-exitcode = $1 $(if $4,(cd $4 && $2),$2) < /dev/null
+.test-human-exitcode = $1 $(PYTHON) scripts/test-driver.py $(if $4,-C$4) $(if
$(V),--verbose) -- $2 < /dev/null
.test-tap-tap = $1 $(if $4,(cd $4 && $2),$2) < /dev/null | sed "s/^[a-z][a-z]*
[0-9]*/& $3/" || true
.test-tap-exitcode = printf "%s\\n" 1..1 "`$1 $(if $4,(cd $4 && $2),$2) <
/dev/null > /dev/null || echo "not "`ok 1 $3"
.test.print = echo $(if $(V),'$1 $2','Running test $3') >&3
diff --git a/scripts/test-driver.py b/scripts/test-driver.py
new file mode 100644
index 0000000000..eef74b29a8
--- /dev/null
+++ b/scripts/test-driver.py
@@ -0,0 +1,35 @@
+#! /usr/bin/env python3
+
+# Wrapper for tests that hides the output if they succeed.
+# Used by "make check"
+#
+# Copyright (C) 2020 Red Hat, Inc.
+#
+# Author: Paolo Bonzini <pbonzini@redhat.com>
+
+import subprocess
+import sys
+import os
+import argparse
+
+parser = argparse.ArgumentParser(description='Test driver for QEMU')
+parser.add_argument('-C', metavar='DIR', dest='dir', default='.',
+ help='change to DIR before doing anything else')
+parser.add_argument('-v', '--verbose', dest='verbose', action='store_true',
+ help='be more verbose')
+parser.add_argument('test_args', nargs=argparse.REMAINDER)
+
+args = parser.parse_args()
+os.chdir(args.dir)
+
+test_args = args.test_args
+if test_args[0] == '--':
+ test_args = test_args[1:]
+
+if args.verbose:
+ result = subprocess.run(test_args, stdout=None, stderr=None)
+else:
+ result = subprocess.run(test_args, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
+ if result.returncode:
+ sys.stdout.buffer.write(result.stdout)
+sys.exit(result.returncode)
--
2.26.2
- [PULL 00/46] Next round of Meson bugfixes and cleanups, Paolo Bonzini, 2020/09/04
- [PULL 02/46] tests/Makefile: test-image-locking needs CONFIG_POSIX, Paolo Bonzini, 2020/09/04
- [PULL 01/46] qemu-iotests: move check-block back to Makefiles, Paolo Bonzini, 2020/09/04
- [PULL 08/46] meson: remove b_lundef option, Paolo Bonzini, 2020/09/04
- [PULL 06/46] mtest2make: hide output of successful tests,
Paolo Bonzini <=
- [PULL 04/46] mtest2make: split environment from test command, Paolo Bonzini, 2020/09/04
- [PULL 09/46] configure: do not include absolute paths in -I and -L paths, Paolo Bonzini, 2020/09/04
- [PULL 16/46] meson: convert qht-bench, Paolo Bonzini, 2020/09/04
- [PULL 14/46] meson: declare tasn1 dependency, Paolo Bonzini, 2020/09/04
- [PULL 07/46] mtest2make: unify tests that appear in multiple suites, Paolo Bonzini, 2020/09/04
- [PULL 13/46] meson: build qapi tests library, Paolo Bonzini, 2020/09/04
- [PULL 12/46] meson: fix libqos linking, Paolo Bonzini, 2020/09/04
- [PULL 10/46] configure: include cross sdl2-config in meson cross file, Paolo Bonzini, 2020/09/04
- [PULL 17/46] meson: convert the unit tests, Paolo Bonzini, 2020/09/04
- [PULL 20/46] meson: convert vhost-user-bridge, Paolo Bonzini, 2020/09/04