Some minor nits on the comments below. Reviewed-by: Mark Janes <[email protected]> Tested-by: Mark Janes <[email protected]>
Dylan Baker <[email protected]> writes: > This adds the necessary bits to make dEQP-EGL work. > > Signed-off-by: Dylan Baker <[email protected]> > CC: Mark Janes <[email protected]> > --- > piglit.conf.example | 10 ++++++++++ > tests/deqp_egl.py | 54 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 64 insertions(+) > create mode 100644 tests/deqp_egl.py > > diff --git a/piglit.conf.example b/piglit.conf.example > index b555129..0a58d98 100644 > --- a/piglit.conf.example > +++ b/piglit.conf.example > @@ -37,6 +37,16 @@ testB > ; Options that affect all deqp based suites > ;extra_args=--deqp-visibility=hidden > > +[deqp-egl] > +; Path to the deqp-gles2 executable wrong name: ^^^^^^^^^^ > +; Can be overwritten by PIGLIT_DEQP_EGL_BIN environment variable > +;bin=/home/knuth/deqp/modules/egl/deqp-egl > + > +; Space-separated list of extra command line arguments for deqp-egl. The > +; option is not required. The environment variable PIGLIT_DEQP_EGL_EXTRA_ARGS > +; overrides the value set here. > +;extra_args=--deqp-visibility hidden > + > [deqp-gles2] > ; Path to the deqp-gles2 executable > ; Can be overwritten by PIGLIT_DEQP_GLES2_BIN environment variable > diff --git a/tests/deqp_egl.py b/tests/deqp_egl.py > new file mode 100644 > index 0000000..27681d3 > --- /dev/null > +++ b/tests/deqp_egl.py > @@ -0,0 +1,54 @@ > +# Copyright 2015-2016 Intel Corporation > +# > +# Permission is hereby granted, free of charge, to any person obtaining a > copy > +# of this software and associated documentation files (the "Software"), to > deal > +# in the Software without restriction, including without limitation the > rights > +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > +# copies of the Software, and to permit persons to whom the Software is > +# furnished to do so, subject to the following conditions: > +# > +# The above copyright notice and this permission notice shall be included in > +# all copies or substantial portions of the Software. > +# > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > FROM, > +# 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 > + > +__all__ = ['profile'] > + > +# Path to the deqp-gles2 executable. wrong name: ^^^^^^^^^^ > +_EGL_BIN = deqp.get_option('PIGLIT_DEQP_EGL_BIN', > + ('deqp-egl', 'bin'), > + required=True) > + > +_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)), > + DEQPEGLTest) > -- > 2.9.2 _______________________________________________ Piglit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/piglit
