From 0b9116e31a6807a442f3a2ec887927536ce3aee3 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Thu, 9 Jul 2020 18:39:34 -0600
Subject: [PATCH] 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>
---
tools/patman/test_util.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 20dc1e4924..4e261755dc 100644
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -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:
--
2.39.5