[Piglit] [PATCH 48/49] framework/test/glsl_parser_test: Add ARB_ESx to command line when needed

[Dylan Baker]

When using the GL binary to run GLES tests the appropriate ES
compatibility extension is added to the fast skipping requirements, but
not to the command line options. It needs to be added to the command
line options too, so that it will be skipped properly when not using the
fast-skipping layer.

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 framework/test/glsl_parser_test.py                | 4 +++-
 unittests/framework/test/test_glsl_parser_test.py | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/test/glsl_parser_test.py b/framework/test/glsl_parser_test.py
index 053afde..b1acb18 100644
--- a/framework/test/glsl_parser_test.py
+++ b/framework/test/glsl_parser_test.py
@@ -136,7 +136,9 @@ class GLSLParserTest(FastSkipMixin, PiglitBaseTest):
                 ver = '3_1'
             elif self.glsl_es_version == 3.2:
                 ver = '3_2'
-            self.gl_required.add('ARB_ES{}_compatibility'.format(ver))
+            ext = 'ARB_ES{}_compatibility'.format(ver)
+            self.gl_required.add(ext)
+            self._command.append(ext)
 
     @staticmethod
     def __pick_binary(version):
diff --git a/unittests/framework/test/test_glsl_parser_test.py b/unittests/framework/test/test_glsl_parser_test.py
index be7a4f5..124f3e9 100644
--- a/unittests/framework/test/test_glsl_parser_test.py
+++ b/unittests/framework/test/test_glsl_parser_test.py
@@ -454,10 +454,10 @@ def test_add_compatibility_requirement_fastskip(version, extension, tmpdir,
 
 
 @pytest.mark.parametrize("version,extension", [
-    pytest.mark.xfail(('1.00', 'ARB_ES2_compatibility')),
-    pytest.mark.xfail(('3.00', 'ARB_ES3_compatibility')),
-    pytest.mark.xfail(('3.10', 'ARB_ES3_1_compatibility')),
-    pytest.mark.xfail(('3.20', 'ARB_ES3_2_compatibility')),
+    ('1.00', 'ARB_ES2_compatibility'),
+    ('3.00', 'ARB_ES3_compatibility'),
+    ('3.10', 'ARB_ES3_1_compatibility'),
+    ('3.20', 'ARB_ES3_2_compatibility'),
 ])
 def test_add_compatibility_requirement_binary(version, extension, tmpdir,
                                               mocker):
-- 
2.9.0