Can I keep the options and environment variables unchanged? It's the same CTS, just a different test list.
Marek On Tue, Sep 27, 2016 at 7:52 PM, Dylan Baker <dy...@pnwbakers.com> wrote: > Quoting Marek Olšák (2016-09-27 09:48:53) >> From: Marek Olšák <marek.ol...@amd.com> >> >> Older versions are broken at the moment and I don't find them useful >> anyway. This also creates the test list faster. >> --- >> tests/cts_gl45.py | 68 >> +++++++++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 68 insertions(+) >> create mode 100644 tests/cts_gl45.py >> >> diff --git a/tests/cts_gl45.py b/tests/cts_gl45.py >> new file mode 100644 >> index 0000000..2782e18 >> --- /dev/null >> +++ b/tests/cts_gl45.py >> @@ -0,0 +1,68 @@ >> +# Copyright (c) 2015 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 Khronos CTS tests. >> + >> +This will run GL45 test cases only. >> + >> +This integration requires some configuration in piglit.conf, or the use of >> +environment variables. >> + >> +In piglit.conf one should set the following: >> +[cts_gl]:bin -- Path to the glcts binary >> +[cts_gl]:extra_args -- any extra arguments to be passed to cts (optional) >> + >> +Alternatively (or in addition, since environment variables have precedence), >> +one could set: >> +PIGLIT_CTS_GL_BIN -- environment equivalent of [cts_gl]:bin >> +PIGLIT_CTS_GL_EXTRA_ARGS -- environment equivalent of [cts_gl]:extra_args > > The values described in this docstring conflict with the ones in gl_cts.py. > Could you fix these to be cts_gl_45 or something? > > Also, could you add the sections to piglit.conf.example, it's a pretty > straightforward copy-n-paste operation. > >> + >> +""" >> + >> +from __future__ import ( >> + absolute_import, division, print_function, unicode_literals >> +) >> +import itertools >> + >> +from framework.test import deqp >> + >> +__all__ = ['profile'] >> + >> +_CTS_BIN = deqp.get_option('PIGLIT_CTS_GL_BIN', ('cts_gl', 'bin'), >> + required=True) >> + >> +_EXTRA_ARGS = deqp.get_option('PIGLIT_CTS_GL_EXTRA_ARGS', ('cts_gl', >> 'extra_args'), >> + default='').split() > > Some with the environment variables here. > >> + >> + >> +class DEQPCTSTest(deqp.DEQPBaseTest): >> + deqp_bin = _CTS_BIN >> + >> + @property >> + def extra_args(self): >> + return super(DEQPCTSTest, self).extra_args + \ >> + [x for x in _EXTRA_ARGS if not x.startswith('--deqp-case')] >> + >> +profile = deqp.make_profile( # pylint: disable=invalid-name >> + itertools.chain( >> + deqp.iter_deqp_test_cases( >> + deqp.gen_caselist_txt(_CTS_BIN, 'GL45-CTS-cases.txt', >> _EXTRA_ARGS)), >> + ), >> + DEQPCTSTest) >> -- >> 2.7.4 >> >> _______________________________________________ >> Piglit mailing list >> Piglit@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/piglit > > With those changes: > Reviewed-by: Dylan Baker <dy...@pnwbakers.com> _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit