tests: Added a new GTF-GLES test profile for the Khronos CTS runner

Submitted by Andres Gomez on Sept. 4, 2018, 9:32 p.m.

Details

Message ID 20180904213232.25088-1-agomez@igalia.com
State Accepted
Commit 9f2e786f7cc3cf19345217772a14e43c9909db3f
Headers show
Series "tests: Added a new GTF-GLES test profile for the Khronos CTS runner" ( rev: 1 ) in Piglit

Not browsing as part of any series.

Commit Message

Andres Gomez Sept. 4, 2018, 9:32 p.m.
Cc: Mark Janes <mark.a.janes@intel.com>
Cc: Dylan Baker <dylanx.c.baker@intel.com>
Cc: Juan A. Suarez Romero <jasuarez@igalia.com>
Signed-off-by: Andres Gomez <agomez@igalia.com>
---
 tests/gtf_gles.py | 82 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 tests/gtf_gles.py

Patch hide | download patch | download mbox

diff --git a/tests/gtf_gles.py b/tests/gtf_gles.py
new file mode 100644
index 000000000..0e0495d08
--- /dev/null
+++ b/tests/gtf_gles.py
@@ -0,0 +1,82 @@ 
+# Copyright (c) 2018 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 KC CTS' GTF tests
+
+By default this will run GLES2, GLES3 and GLES31 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 gtf_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:
+[gtf_gles]:bin -- Path to the glcts binary
+[gtf_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_GTF_GLES_BIN -- environment equivalent of [gtf_gles]:bin
+PIGLIT_GTF_GLES_EXTRA_ARGS -- environment equivalent of
+[gtf_gles]:extra_args
+
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+import itertools
+
+from framework.test import deqp
+
+__all__ = ['profile']
+
+_GTF_BIN = deqp.get_option('PIGLIT_GTF_GLES_BIN', ('gtf_gles', 'bin'),
+                           required=True)
+
+_EXTRA_ARGS = deqp.get_option('PIGLIT_GTF_GLES_EXTRA_ARGS', ('gtf_gles', 'extra_args'),
+                              default='').split()
+
+
+class DEQPGTFTest(deqp.DEQPBaseTest):
+    deqp_bin = _GTF_BIN
+
+    @property
+    def extra_args(self):
+        return super(DEQPGTFTest, 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(_GTF_BIN, 'GTF-GLES2-cases.txt', _EXTRA_ARGS)),
+        deqp.iter_deqp_test_cases(
+            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES3-cases.txt', _EXTRA_ARGS)),
+        deqp.iter_deqp_test_cases(
+            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES31-cases.txt', _EXTRA_ARGS)),
+    ),
+    DEQPGTFTest)

Comments

Reviewed-by: Juan A. Suarez <jasuarez@igalia.com>

On Wed, 2018-09-05 at 00:32 +0300, Andres Gomez wrote:
> Cc: Mark Janes <mark.a.janes@intel.com>
> Cc: Dylan Baker <dylanx.c.baker@intel.com>
> Cc: Juan A. Suarez Romero <jasuarez@igalia.com>
> Signed-off-by: Andres Gomez <agomez@igalia.com>
> ---
>  tests/gtf_gles.py | 82 +++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 82 insertions(+)
>  create mode 100644 tests/gtf_gles.py
> 
> diff --git a/tests/gtf_gles.py b/tests/gtf_gles.py
> new file mode 100644
> index 000000000..0e0495d08
> --- /dev/null
> +++ b/tests/gtf_gles.py
> @@ -0,0 +1,82 @@
> +# Copyright (c) 2018 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 KC CTS' GTF tests
> +
> +By default this will run GLES2, GLES3 and GLES31 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 gtf_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:
> +[gtf_gles]:bin -- Path to the glcts binary
> +[gtf_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_GTF_GLES_BIN -- environment equivalent of [gtf_gles]:bin
> +PIGLIT_GTF_GLES_EXTRA_ARGS -- environment equivalent of
> +[gtf_gles]:extra_args
> +
> +"""
> +
> +from __future__ import (
> +    absolute_import, division, print_function, unicode_literals
> +)
> +import itertools
> +
> +from framework.test import deqp
> +
> +__all__ = ['profile']
> +
> +_GTF_BIN = deqp.get_option('PIGLIT_GTF_GLES_BIN', ('gtf_gles', 'bin'),
> +                           required=True)
> +
> +_EXTRA_ARGS = deqp.get_option('PIGLIT_GTF_GLES_EXTRA_ARGS', ('gtf_gles', 'extra_args'),
> +                              default='').split()
> +
> +
> +class DEQPGTFTest(deqp.DEQPBaseTest):
> +    deqp_bin = _GTF_BIN
> +
> +    @property
> +    def extra_args(self):
> +        return super(DEQPGTFTest, 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(_GTF_BIN, 'GTF-GLES2-cases.txt', _EXTRA_ARGS)),
> +        deqp.iter_deqp_test_cases(
> +            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES3-cases.txt', _EXTRA_ARGS)),
> +        deqp.iter_deqp_test_cases(
> +            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES31-cases.txt', _EXTRA_ARGS)),
> +    ),
> +    DEQPGTFTest)
Quoting Andres Gomez (2018-09-04 14:32:32)
> Cc: Mark Janes <mark.a.janes@intel.com>
> Cc: Dylan Baker <dylanx.c.baker@intel.com>
> Cc: Juan A. Suarez Romero <jasuarez@igalia.com>
> Signed-off-by: Andres Gomez <agomez@igalia.com>
> ---
>  tests/gtf_gles.py | 82 +++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 82 insertions(+)
>  create mode 100644 tests/gtf_gles.py
> 
> diff --git a/tests/gtf_gles.py b/tests/gtf_gles.py
> new file mode 100644
> index 000000000..0e0495d08
> --- /dev/null
> +++ b/tests/gtf_gles.py
> @@ -0,0 +1,82 @@
> +# Copyright (c) 2018 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 KC CTS' GTF tests
> +
> +By default this will run GLES2, GLES3 and GLES31 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 gtf_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:
> +[gtf_gles]:bin -- Path to the glcts binary
> +[gtf_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_GTF_GLES_BIN -- environment equivalent of [gtf_gles]:bin
> +PIGLIT_GTF_GLES_EXTRA_ARGS -- environment equivalent of
> +[gtf_gles]:extra_args
> +
> +"""
> +
> +from __future__ import (
> +    absolute_import, division, print_function, unicode_literals
> +)
> +import itertools
> +
> +from framework.test import deqp
> +
> +__all__ = ['profile']
> +
> +_GTF_BIN = deqp.get_option('PIGLIT_GTF_GLES_BIN', ('gtf_gles', 'bin'),
> +                           required=True)
> +
> +_EXTRA_ARGS = deqp.get_option('PIGLIT_GTF_GLES_EXTRA_ARGS', ('gtf_gles', 'extra_args'),
> +                              default='').split()
> +
> +
> +class DEQPGTFTest(deqp.DEQPBaseTest):
> +    deqp_bin = _GTF_BIN
> +
> +    @property
> +    def extra_args(self):
> +        return super(DEQPGTFTest, 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(_GTF_BIN, 'GTF-GLES2-cases.txt', _EXTRA_ARGS)),
> +        deqp.iter_deqp_test_cases(
> +            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES3-cases.txt', _EXTRA_ARGS)),
> +        deqp.iter_deqp_test_cases(
> +            deqp.gen_caselist_txt(_GTF_BIN, 'GTF-GLES31-cases.txt', _EXTRA_ARGS)),
> +    ),
> +    DEQPGTFTest)
> -- 
> 2.18.0
> 

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>