[Piglit] [PATCH 5/5] deqp_egl: add support for mustpass lists

Marek Olšák maraeo at gmail.com
Wed May 2 20:32:47 UTC 2018


From: Nicolai Hähnle <nicolai.haehnle at amd.com>

---
 tests/deqp_egl.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/tests/deqp_egl.py b/tests/deqp_egl.py
index 7422c82e3..ccd40b2af 100644
--- a/tests/deqp_egl.py
+++ b/tests/deqp_egl.py
@@ -19,36 +19,40 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
 """Piglit integrations for dEQP EGL tests."""
 
 from __future__ import (
     absolute_import, division, print_function, unicode_literals
 )
 
 from framework.test import deqp
+from framework.options import OPTIONS
 
 __all__ = ['profile']
 
 _EGL_BIN = deqp.get_option('PIGLIT_DEQP_EGL_BIN',
                            ('deqp-egl', 'bin'),
                            required=True)
 
+_DEQP_MUSTPASS = deqp.get_option('PIGLIT_DEQP_EGL_MUSTPASS',
+                                 ('deqp-egl', 'mustpasslist'),
+                                 required=OPTIONS.deqp_mustpass)
+
 _EXTRA_ARGS = deqp.get_option('PIGLIT_DEQP_EGL_EXTRA_ARGS',
                               ('deqp-egl', 'extra_args'),
                               default='').split()
 
 
 class DEQPEGLTest(deqp.DEQPBaseTest):
     deqp_bin = _EGL_BIN
 
     @property
     def extra_args(self):
         return super(DEQPEGLTest, self).extra_args + \
             [x for x in _EXTRA_ARGS if not x.startswith('--deqp-case')]
 
 
 profile = deqp.make_profile(  # pylint: disable=invalid-name
-    deqp.iter_deqp_test_cases(
-        deqp.gen_caselist_txt(_EGL_BIN, 'dEQP-EGL-cases.txt',
-                              _EXTRA_ARGS)),
+    deqp.select_source(_EGL_BIN, 'dEQP-EGL-cases.txt', _DEQP_MUSTPASS,
+                       _EXTRA_ARGS),
     DEQPEGLTest)
-- 
2.17.0



More information about the Piglit mailing list