Mesa i965 CI doesn't use piglit anymore to run CTS, so we won't be affected by this patch.
Andres Gomez <ago...@igalia.com> writes: > OpenGL GLES*-CTS case lists were renamed to KHR-GLES* in the upstream > repository. > > We want to keep the existing profiles so we are able to keep running > the caselists from previous CTS releases and for branches in the open > sourced repository created for API-specific release branches, as > explained at: > https://github.com/KhronosGroup/VK-GL-CTS/wiki/Contributing#branches > > Therefore, we add this new test profile to be able to run the renamed > tests in the master branch of the opensourced Khronos CTS tests at: > https://github.com/KhronosGroup/VK-GL-CTS > > Cc: Mark Janes <mark.a.ja...@intel.com> > Cc: Dylan Baker <dylanx.c.ba...@intel.com> > Cc: Juan A. Suarez Romero <jasua...@igalia.com> > Signed-off-by: Andres Gomez <ago...@igalia.com> > --- > tests/khr_gles.py | 88 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > create mode 100644 tests/khr_gles.py > > diff --git a/tests/khr_gles.py b/tests/khr_gles.py > new file mode 100644 > index 000000000..59a0fe089 > --- /dev/null > +++ b/tests/khr_gles.py > @@ -0,0 +1,88 @@ > +# Copyright (c) 2017 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 integration for the now open sourced Khronos CTS tests being > +developed at https://github.com/KhronosGroup/VK-GL-CTS > + > +By default this will run GLES2, GLES3, GLES31, GLES32, and GLESEXT > +test cases. Those desiring to run only a subset of them should > +consider using the -t or -x options to include or exclude tests. > + > +For example: > +./piglit run khr_gles -c foo -t ES3- would run only ES3 tests (note > +the dash to exclude ES31 tests) > + > +This integration requires some configuration in piglit.conf, or the > +use of environment variables. > + > +In piglit.conf one should set the following: > +[khr_gles]:bin -- Path to the glcts binary > +[khr_gles]:extra_args -- any extra arguments to be passed to cts > +(optional) > + > +Alternatively (or in addition, since environment variables have > +precedence), one could set: > +PIGLIT_KHR_GLES_BIN -- environment equivalent of [khr_gles]:bin > +PIGLIT_KHR_GLES_EXTRA_ARGS -- environment equivalent of > +[khr_gles]:extra_args > + > +""" > + > +from __future__ import ( > + absolute_import, division, print_function, unicode_literals > +) > +import itertools > + > +from framework.test import deqp > + > +__all__ = ['profile'] > + > +_KHR_BIN = deqp.get_option('PIGLIT_KHR_GLES_BIN', ('khr_gles', 'bin'), > + required=True) > + > +_EXTRA_ARGS = deqp.get_option('PIGLIT_KHR_GLES_EXTRA_ARGS', ('khr_gles', > 'extra_args'), > + default='').split() > + > + > +class DEQPKHRTest(deqp.DEQPBaseTest): > + deqp_bin = _KHR_BIN > + > + @property > + def extra_args(self): > + return super(DEQPKHRTest, self).extra_args + \ > + [x for x in _EXTRA_ARGS if not x.startswith('--deqp-case')] > + > + > +# Add all of the suites by default, users can use filters to remove them. > +profile = deqp.make_profile( # pylint: disable=invalid-name > + itertools.chain( > + deqp.iter_deqp_test_cases( > + deqp.gen_caselist_txt(_KHR_BIN, 'KHR-GLES2-cases.txt', > _EXTRA_ARGS)), > + deqp.iter_deqp_test_cases( > + deqp.gen_caselist_txt(_KHR_BIN, 'KHR-GLES3-cases.txt', > _EXTRA_ARGS)), > + deqp.iter_deqp_test_cases( > + deqp.gen_caselist_txt(_KHR_BIN, 'KHR-GLES31-cases.txt', > _EXTRA_ARGS)), > + deqp.iter_deqp_test_cases( > + deqp.gen_caselist_txt(_KHR_BIN, 'KHR-GLES32-cases.txt', > _EXTRA_ARGS)), > + deqp.iter_deqp_test_cases( > + deqp.gen_caselist_txt(_KHR_BIN, 'KHR-GLESEXT-cases.txt', > + _EXTRA_ARGS)), > + ), > + DEQPKHRTest) > -- > 2.15.1 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit
