[v2,10/49] binman: Re-enable concurrent tests

Message ID 20200613205717.v2.10.I6d9ab323720e230ba651cb6f734835b19238fbd4@changeid
State Accepted
Commit 0b9116e31a6807a442f3a2ec887927536ce3aee3
Headers show
Series
  • rockchip: x86: Support building ROM files automatically with binman
Related show

Commit Message

Simon Glass June 14, 2020, 2:56 a.m.
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 at chromium.org>
---

(no changes since v1)

 tools/patman/test_util.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 467797e380..2ef4e52de8 100644
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -17,7 +17,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
 
@@ -51,6 +52,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 else '-t'
     prefix = ''
     if build_dir: