mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-24 21:54:01 +00:00
patman: Update cover-coverage tests for Python 3
We need slightly different commands to run code coverage with Python 3. Update the RunTestCoverage() function to handle this. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
5385f5a018
commit
9550f9acd6
1 changed files with 9 additions and 6 deletions
|
@ -17,6 +17,8 @@ try:
|
|||
except ImportError:
|
||||
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
|
||||
|
@ -43,11 +45,12 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
|
|||
else:
|
||||
glob_list = []
|
||||
glob_list += exclude_list
|
||||
glob_list += ['*libfdt.py', '*site-packages*']
|
||||
cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools python-coverage run '
|
||||
'--omit "%s" %s -P1 -t' % (build_dir, ','.join(glob_list), prog))
|
||||
glob_list += ['*libfdt.py', '*site-packages*', '*dist-packages*']
|
||||
cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools %s-coverage run '
|
||||
'--omit "%s" %s -P1 -t' % (build_dir, PYTHON, ','.join(glob_list),
|
||||
prog))
|
||||
os.system(cmd)
|
||||
stdout = command.Output('python-coverage', 'report')
|
||||
stdout = command.Output('%s-coverage' % PYTHON, 'report')
|
||||
lines = stdout.splitlines()
|
||||
if required:
|
||||
# Convert '/path/to/name.py' just the module name 'name'
|
||||
|
@ -65,8 +68,8 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
|
|||
print(coverage)
|
||||
if coverage != '100%':
|
||||
print(stdout)
|
||||
print("Type 'python-coverage html' to get a report in "
|
||||
'htmlcov/index.html')
|
||||
print("Type '%s-coverage html' to get a report in "
|
||||
'htmlcov/index.html' % PYTHON)
|
||||
print('Coverage error: %s, but should be 100%%' % coverage)
|
||||
ok = False
|
||||
if not ok:
|
||||
|
|
Loading…
Reference in a new issue