diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2015-01-28 16:06:04 -0800 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2015-03-05 09:46:47 -0800 |
| commit | ef8c35efa596102940220b101fc08fcf31c7e303 (patch) | |
| tree | d5a040600dd2d296607c707c12be6a16a49c435f | |
| parent | b166fea985851fd2c35396cbec09c4756c0c8d61 (diff) | |
piglit_test.py: Change run_concurrent to True by default
This will flip the value of the flag for PiglitGLTest, ShaderTest, and
GLSLParserTest. It will not affect PiglitCLTest (That's OpenCL), because
of the previous patch, which causes PiglitCLTest to use a unique
concurrency setting method.
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
| -rw-r--r-- | framework/test/piglit_test.py | 4 | ||||
| -rw-r--r-- | tests/all.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py index 51aa8e896..5dd2de6e9 100644 --- a/framework/test/piglit_test.py +++ b/framework/test/piglit_test.py @@ -59,8 +59,8 @@ class PiglitBaseTest(Test): Expect one line prefixed PIGLIT: in the output, which contains a result dictionary. The plain output is appended to this dictionary """ - def __init__(self, *args, **kwargs): - super(PiglitBaseTest, self).__init__(*args, **kwargs) + def __init__(self, command, run_concurrent=True, **kwargs): + super(PiglitBaseTest, self).__init__(command, run_concurrent, **kwargs) # Prepend TEST_BIN_DIR to the path. self._command[0] = os.path.join(TEST_BIN_DIR, self._command[0]) diff --git a/tests/all.py b/tests/all.py index 68d0fd4e1..5049c861d 100644 --- a/tests/all.py +++ b/tests/all.py @@ -2399,8 +2399,8 @@ with profile.group_manager( with profile.group_manager( PiglitGLTest, grouptools.join('spec', 'ARB_program_interface_query')) as g: - g(['arb_program_interface_query-resource-location']) - g(['arb_program_interface_query-resource-index']) + g(['arb_program_interface_query-resource-location'], run_concurrent=False) + g(['arb_program_interface_query-resource-index'], run_concurrent=False) # Group ARB_explicit_uniform_location with profile.group_manager( |