diff options
| author | Dylan Baker <baker.dylan.c@gmail.com> | 2015-06-22 16:25:16 -0700 |
|---|---|---|
| committer | Dylan Baker <baker.dylan.c@gmail.com> | 2015-06-23 13:09:33 -0700 |
| commit | c167b57575c0a4b3170b2fa59aec3b1b210a7cd9 (patch) | |
| tree | ca45c08c62d51330d1c94d8c1dd8bb378c2310f7 /tests/deqp_gles3.py | |
| parent | 1ff30581859d6aa34d807dca8f941cc6be3aae08 (diff) | |
framework/test/deqp: handle deqp extra args properly in more cases
Currently we blindly pass deqp extra args to each test case, and only to
the test case.
There are two cases where this is problematic:
1) if the extra args need to be passed to the deqp command that
generates the test list (it isn't before this patch)
2) if there are any --deqp-case options passed into the Test derived
classes this will cause the tests to fail (conflicting options)
Both of these are resolved by this patch.
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Diffstat (limited to 'tests/deqp_gles3.py')
| -rw-r--r-- | tests/deqp_gles3.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/deqp_gles3.py b/tests/deqp_gles3.py index dfb82c970..d35389993 100644 --- a/tests/deqp_gles3.py +++ b/tests/deqp_gles3.py @@ -35,6 +35,10 @@ _DEQP_GLES3_EXE = deqp.get_option('PIGLIT_DEQP_GLES3_EXE', _DEQP_MUSTPASS = deqp.get_option('PIGLIT_DEQP_MUSTPASS', ('deqp-gles3', 'mustpasslist')) +_EXTRA_ARGS = deqp.get_option('PIGLIT_DEQP_GLES3_EXTRA_ARGS', + ('deqp-gles3', 'extra_args'), + default='').split() + def _get_test_case(root, root_group, outputfile): """Parser the test case list of Google Android CTS, @@ -73,9 +77,7 @@ def filter_mustpass(caselist_path): class DEQPGLES3Test(deqp.DEQPBaseTest): deqp_bin = _DEQP_GLES3_EXE - extra_args = deqp.get_option('PIGLIT_DEQP_GLES3_EXTRA_ARGS', - ('deqp-gles3', 'extra_args'), - default='').split() + extra_args = [x for x in _EXTRA_ARGS if not x.startswith('--deqp-case')] def __init__(self, *args, **kwargs): @@ -84,5 +86,6 @@ class DEQPGLES3Test(deqp.DEQPBaseTest): profile = deqp.make_profile( # pylint: disable=invalid-name deqp.iter_deqp_test_cases(filter_mustpass( - deqp.gen_caselist_txt(_DEQP_GLES3_EXE, 'dEQP-GLES3-cases.txt'))), + deqp.gen_caselist_txt(_DEQP_GLES3_EXE, 'dEQP-GLES3-cases.txt', + _EXTRA_ARGS))), DEQPGLES3Test) |