binman: Re-enable concurrent tests

With the change to absolute imports the concurrent tests feature
unfortunately broke. Fix it.

We cannot easy add a warning, since the output messes up tests which check
the output.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-07-09 18:39:34 -06:00
parent 52b10dd7de
commit 347e0f00e8
1 changed files with 3 additions and 1 deletions

View File

@ -16,7 +16,8 @@ from io import StringIO
use_concurrent = True
try:
from concurrencytest import ConcurrentTestSuite, fork_for_tests
from concurrencytest.concurrencytest import ConcurrentTestSuite
from concurrencytest.concurrencytest import fork_for_tests
except:
use_concurrent = False
@ -50,6 +51,7 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None,
glob_list = []
glob_list += exclude_list
glob_list += ['*libfdt.py', '*site-packages*', '*dist-packages*']
glob_list += ['*concurrencytest*']
test_cmd = 'test' if 'binman' in prog or 'patman' in prog else '-t'
prefix = ''
if build_dir: