diff options
| author | Simon Glass <sjg@chromium.org> | 2020-04-17 18:09:00 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-04-26 14:25:21 -0600 |
| commit | 428e773011b319b50db0ff7d5cf331ec37f75175 (patch) | |
| tree | 773b3050e04e670703896fa99e7a72b2c60df93d | |
| parent | 76160801b0121515d6d33e4e26a54d34296687b4 (diff) | |
| download | u-boot-428e773011b319b50db0ff7d5cf331ec37f75175.tar.gz | |
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>
| -rw-r--r-- | tools/patman/test_util.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py index 76dbc21e3a..6575b11c1a 100644 --- a/tools/patman/test_util.py +++ b/tools/patman/test_util.py @@ -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: |