dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-29 22:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

binman: Specify the toolpath when running test coverage

Browse Source 
At present binman's test coverage runs without a toolpath set. This means
that the system tools will be used. That may not be correct if they are
out of date or missing and this can result in a reduction in test coverage
below 100%.

Provide the toolpath to binman in this case.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2020-07-09 18:39:29 -06:00
parent fdb3040e96
commit 32eb66d2d4
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/binman/main.py
View File

@@ -89,14 +89,18 @@ def GetEntryModules(include_testing=True):
for item in glob_list for item in glob_list
if include_testing or '_testing' not in item]) if include_testing or '_testing' not in item])
def RunTestCoverage(): def RunTestCoverage(toolpath):
"""Run the tests and check that we get 100% coverage""" """Run the tests and check that we get 100% coverage"""
glob_list = GetEntryModules(False) glob_list = GetEntryModules(False)
all_set = set([os.path.splitext(os.path.basename(item))[0] all_set = set([os.path.splitext(os.path.basename(item))[0]
for item in glob_list if '_testing' not in item]) for item in glob_list if '_testing' not in item])
extra_args = ''
if toolpath:
for path in toolpath:
extra_args += ' --toolpath %s' % path
test_util.RunTestCoverage('tools/binman/binman', None, test_util.RunTestCoverage('tools/binman/binman', None,
['*test*', '*main.py', 'tools/patman/*', 'tools/dtoc/*'], ['*test*', '*main.py', 'tools/patman/*', 'tools/dtoc/*'],
args.build_dir, all_set) args.build_dir, all_set, extra_args or None)
def RunBinman(args): def RunBinman(args):
"""Main entry point to binman once arguments are parsed """Main entry point to binman once arguments are parsed
@@ -111,7 +115,7 @@ def RunBinman(args):
if args.cmd == 'test': if args.cmd == 'test':
if args.test_coverage: if args.test_coverage:
RunTestCoverage() RunTestCoverage(args.toolpath)
else: else:
ret_code = RunTests(args.debug, args.verbosity, args.processes, ret_code = RunTests(args.debug, args.verbosity, args.processes,
args.test_preserve_dirs, args.tests, args.test_preserve_dirs, args.tests,

9
tools/patman/test_util.py
View File

@@ -21,7 +21,8 @@ except:
use_concurrent = False use_concurrent = False
def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None): def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None,
extra_args=None):
"""Run tests and check that we get 100% coverage """Run tests and check that we get 100% coverage
Args: Args:
@@ -34,6 +35,8 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
calculation calculation
build_dir: Build directory, used to locate libfdt.py build_dir: Build directory, used to locate libfdt.py
required: List of modules which must be in the coverage report required: List of modules which must be in the coverage report
extra_args (str): Extra arguments to pass to the tool before the -t/test
arg
Raises: Raises:
ValueError if the code coverage is not 100% ValueError if the code coverage is not 100%
@@ -52,8 +55,8 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
if build_dir: if build_dir:
prefix = 'PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools ' % build_dir prefix = 'PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools ' % build_dir
cmd = ('%spython3-coverage run ' cmd = ('%spython3-coverage run '
'--omit "%s" %s %s -P1' % (prefix, ','.join(glob_list), '--omit "%s" %s %s %s -P1' % (prefix, ','.join(glob_list),
prog, test_cmd)) prog, extra_args or '', test_cmd))
os.system(cmd) os.system(cmd)
stdout = command.Output('python3-coverage', 'report') stdout = command.Output('python3-coverage', 'report')
lines = stdout.splitlines() lines = stdout.splitlines()