binman: Allow verbosity control when running tests
At present the -v flag is ignored with tests, so that (for example) -v2
does not have any effect. Update binman to pass this flag through to tests
so that they work just like running binman normally, except in a few
special cases where we are actually testing behaviour with different
levels of verbosity.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index bab9882..7c1dcfb6 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -46,11 +46,12 @@
import control
import test_util
-def RunTests(debug, processes, args):
+def RunTests(debug, verbosity, processes, args):
"""Run the functional tests and any embedded doctests
Args:
debug: True to enable debugging, which shows a full stack trace on error
+ verbosity: Verbosity level to use
args: List of positional args provided to binman. This can hold a test
name to execute (as in 'binman -t testSections', for example)
processes: Number of processes to use to run tests (None=same as #CPUs)
@@ -71,6 +72,8 @@
sys.argv = [sys.argv[0]]
if debug:
sys.argv.append('-D')
+ if verbosity:
+ sys.argv.append('-v%d' % verbosity)
# Run the entry tests first ,since these need to be the first to import the
# 'entry' module.
@@ -153,7 +156,8 @@
sys.tracebacklimit = 0
if options.test:
- ret_code = RunTests(options.debug, options.processes, args[1:])
+ ret_code = RunTests(options.debug, options.verbosity, options.processes,
+ args[1:])
elif options.test_coverage:
RunTestCoverage()