[Piglit] [PATCH] Fix concurrency bug.

Dylan Baker baker.dylan.c at gmail.com
Tue Dec 24 21:59:54 PST 2013


Commit d525a0cededab9eff43d7597a3593d843428a68b introduces a bug into
the -1/--no-concurrency option that causes only tests exculsively marked
as non-concurrent to be run.

This patch addresses that bug by causes all tests to be added to a
serial pool when the -1/--no-concurrency option is used.

bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=73018
CC: vlee at freedesktop.org
Signed-off-by: Dylan Baker <baker.dylan.c at gmail.com>
---
 framework/core.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/framework/core.py b/framework/core.py
index c8dc4bc..559bce6 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -575,8 +575,7 @@ class TestProfile:
         elif env.concurrent == "none":
             pool = ThreadPool(1)
             for (path, test) in self.test_list.items():
-                if not env.concurrent or not test.runConcurrent:
-                    pool.add(test.execute, (env, path, json_writer))
+                pool.add(test.execute, (env, path, json_writer))
             pool.join()
         else:
             pool = ThreadPool(multiprocessing.cpu_count())
-- 
1.8.5.2



More information about the Piglit mailing list