binman: Move coverage logic into a new test_util file
At present only binman has the logic for determining Python test coverage
but this is useful for other tools also. Move it out into a separate file
so it can be used by other tools.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/binman/binman.py b/tools/binman/binman.py
index 74862b1..52e02ed 100755
--- a/tools/binman/binman.py
+++ b/tools/binman/binman.py
@@ -26,6 +26,7 @@
import cmdline
import command
import control
+import test_util
def RunTests(debug, args):
"""Run the functional tests and any embedded doctests
@@ -78,34 +79,12 @@
def RunTestCoverage():
"""Run the tests and check that we get 100% coverage"""
- # This uses the build output from sandbox_spl to get _libfdt.so
- cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools python-coverage run '
- '--include "tools/binman/*.py" --omit "*test*,*binman.py" '
- 'tools/binman/binman.py -t' % options.build_dir)
- os.system(cmd)
- stdout = command.Output('python-coverage', 'report')
- lines = stdout.splitlines()
-
- test_set= set([os.path.basename(line.split()[0])
- for line in lines if '/etype/' in line])
glob_list = glob.glob(os.path.join(our_path, 'etype/*.py'))
all_set = set([os.path.splitext(os.path.basename(item))[0]
for item in glob_list if '_testing' not in item])
- missing_list = all_set
- missing_list.difference_update(test_set)
- coverage = lines[-1].split(' ')[-1]
- ok = True
- if missing_list:
- print 'Missing tests for %s' % (', '.join(missing_list))
- print stdout
- ok = False
- if coverage != '100%':
- print stdout
- print "Type 'coverage html' to get a report in htmlcov/index.html"
- print 'Coverage error: %s, but should be 100%%' % coverage
- ok = False
- if not ok:
- raise ValueError('Test coverage failure')
+ test_util.RunTestCoverage('tools/binman/binman.py', None,
+ ['*test*', '*binman.py', 'tools/patman/*', 'tools/dtoc/*'],
+ options.build_dir, all_set)
def RunBinman(options, args):
"""Main entry point to binman once arguments are parsed