summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2014-04-11 12:25:17 -0700
committerDylan Baker <baker.dylan.c@gmail.com>2014-04-11 13:10:16 -0700
commite67765a97bec944ad1bb553644a60ad87f02ff10 (patch)
tree109ceeaddf1b9ee2cdaf7c6d0eaddea97b488c86
parent64d4c6f950dd16aea48e9c9a1fdb339ab49911e4 (diff)
framework: Fix concurrency regression introduced by Test refactor
For whatever reason the concurrency flag was not passed to GLSLParserTest and ShaderTest after the refactor. This patch fixes that by always passing that keyword argument as was done before. Signed-off-by: Dylan Baker <baker.dylan.c@gmail.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com>
-rw-r--r--framework/glsl_parser_test.py2
-rw-r--r--framework/shader_test.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/framework/glsl_parser_test.py b/framework/glsl_parser_test.py
index e996643aa..4c1da4903 100644
--- a/framework/glsl_parser_test.py
+++ b/framework/glsl_parser_test.py
@@ -154,7 +154,7 @@ class GLSLParserTest(PiglitTest):
command.append('--check-link')
command.extend(config.get('config', 'require_extensions').split())
- super(GLSLParserTest, self).__init__(command)
+ super(GLSLParserTest, self).__init__(command, run_concurrent=True)
class GLSLParserException(Exception):
diff --git a/framework/shader_test.py b/framework/shader_test.py
index 572810097..fecd8072f 100644
--- a/framework/shader_test.py
+++ b/framework/shader_test.py
@@ -83,7 +83,8 @@ class ShaderTest(PiglitTest):
else:
raise ShaderTestParserException("No GL version set")
- super(ShaderTest, self).__init__([prog, arguments, '-auto'])
+ super(ShaderTest, self).__init__([prog, arguments, '-auto'],
+ run_concurrent=True)
class ShaderTestParserException(Exception):