mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
patman: Drop the python2 code in test coverage
We don't need to run test coverage with Python 2 now. Drop the special-case code. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
76160801b0
commit
428e773011
1 changed files with 8 additions and 7 deletions
|
@ -12,8 +12,6 @@ import command
|
|||
|
||||
from io import StringIO
|
||||
|
||||
PYTHON = 'python%d' % sys.version_info[0]
|
||||
|
||||
|
||||
def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
|
||||
"""Run tests and check that we get 100% coverage
|
||||
|
@ -42,11 +40,14 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
|
|||
glob_list += exclude_list
|
||||
glob_list += ['*libfdt.py', '*site-packages*', '*dist-packages*']
|
||||
test_cmd = 'test' if 'binman' in prog else '-t'
|
||||
cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools %s-coverage run '
|
||||
'--omit "%s" %s %s -P1' % (build_dir, PYTHON, ','.join(glob_list),
|
||||
prefix = ''
|
||||
if build_dir:
|
||||
prefix = 'PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools ' % build_dir
|
||||
cmd = ('%spython3-coverage run '
|
||||
'--omit "%s" %s %s -P1' % (prefix, ','.join(glob_list),
|
||||
prog, test_cmd))
|
||||
os.system(cmd)
|
||||
stdout = command.Output('%s-coverage' % PYTHON, 'report')
|
||||
stdout = command.Output('python3-coverage', 'report')
|
||||
lines = stdout.splitlines()
|
||||
if required:
|
||||
# Convert '/path/to/name.py' just the module name 'name'
|
||||
|
@ -65,8 +66,8 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
|
|||
print(coverage)
|
||||
if coverage != '100%':
|
||||
print(stdout)
|
||||
print("Type '%s-coverage html' to get a report in "
|
||||
'htmlcov/index.html' % PYTHON)
|
||||
print("Type 'python3-coverage html' to get a report in "
|
||||
'htmlcov/index.html')
|
||||
print('Coverage error: %s, but should be 100%%' % coverage)
|
||||
ok = False
|
||||
if not ok:
|
||||
|
|
Loading…
Reference in a new issue