framework: Add generic deqp options to piglit.conf

Sometimes there are extra arguments to deqp that a developer wants for
all of the test suites, this adds that option by putting a generic
[deqp] section and add an extra_args. This new extra args gets joined
with any suite specific extra_args

Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

1 files changed, 17 insertions, 11 deletions

diff --git a/framework/test/deqp.py b/framework/test/deqp.py
index 0c4b8a04d..4fd51eca0 100644
--- a/framework/test/deqp.py
+++ b/framework/test/deqp.py
@@ -40,17 +40,6 @@ __all__ = [
 ]
 
 
-def make_profile(test_list, test_class):
-    """Create a TestProfile instance."""
-    profile = TestProfile()
-    for testname in test_list:
-        # deqp uses '.' as the testgroup separator.
-        piglit_name = testname.replace('.', grouptools.SEPARATOR)
-        profile.test_list[piglit_name] = test_class(testname)
-
-    return profile
-
-
 def get_option(env_varname, config_option, default=None):
     """Query the given environment variable and then piglit.conf for the option.
 
@@ -66,6 +55,22 @@ def get_option(env_varname, config_option, default=None):
     return opt or default
 
 
+_EXTRA_ARGS = get_option('PIGLIT_DEQP_EXTRA_ARGS',
+                         ('deqp', 'extra_args'),
+                         default='').split()
+
+
+def make_profile(test_list, test_class):
+    """Create a TestProfile instance."""
+    profile = TestProfile()
+    for testname in test_list:
+        # deqp uses '.' as the testgroup separator.
+        piglit_name = testname.replace('.', grouptools.SEPARATOR)
+        profile.test_list[piglit_name] = test_class(testname)
+
+    return profile
+
+
 def gen_caselist_txt(bin_, caselist, extra_args):
     """Generate a caselist.txt and return its path.
 
@@ -129,6 +134,7 @@ class DEQPBaseTest(Test):
         only works to join two lists together.
 
         """
+        return _EXTRA_ARGS
 
     def __init__(self, case_name):
         command = [self.deqp_bin, '--deqp-case=' + case_name]