summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorChad Versace <chad@chad-versace.us>2011-06-17 10:57:30 -0700
committerKenneth Graunke <kenneth@whitecape.org>2011-07-29 17:35:54 -0700
commit8762fc74edbc6a26de39a7507b935755e9feff5e (patch)
treebabfc14cdc37156e662343312a47a69e3873c042 /framework
parent6a6a549863d318fdd9b7d58e2c8f4ea03fb1766f (diff)
piglit-run: Add option to enable/disable concurrent test runs
-c bool, --concurrent=bool Enable/disable concurrent test runs. Valid option values are: 0, 1, on, off. (default: on) CC: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Chad Versace <chad@chad-versace.us> Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'framework')
-rw-r--r--framework/core.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/core.py b/framework/core.py
index 326b3d987..90aa46104 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -386,6 +386,7 @@ class TestrunResult:
class Environment:
def __init__(self):
+ self.concurrent = True
self.execute = True
self.filter = []
self.exclude_filter = []
@@ -436,7 +437,7 @@ class Test:
assigned to ``testrun.tests[path]``
'''
args = (env, path, json_writer)
- if self.runConcurrent:
+ if self.runConcurrent and env.concurrent:
ConcurrentTestPool().put(self.__doRunWork, args=args)
else:
self.__doRunWork(*args)