date:20180213

Re: [Piglit] [PATCH] degenerate-prims: fix incorrect return value from test_prim()

2018-02-13 Thread Dylan Baker

Oops,
Reviewed-by: Dylan Baker 

Quoting Brian Paul (2018-02-13 13:26:18)
> The function is supposed to return a piglit_result, not true/false.
> Fixes incorrect 'fail' results.
> ---
>  tests/general/degenerate-prims.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/general/degenerate-prims.c 
> b/tests/general/degenerate-prims.c
> index 0eed99c..3001d34 100644
> --- a/tests/general/degenerate-prims.c
> +++ b/tests/general/degenerate-prims.c
> @@ -72,7 +72,7 @@ test_prim(void *_data)
> piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL,
>  "Primitive: %s", 
> piglit_get_prim_name(data->prim));
>  
> -   return pass;
> +   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
>  }
>  
>  
> -- 
> 2.7.4
> 


signature.asc
Description: signature
___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] degenerate-prims: fix incorrect return value from test_prim()

2018-02-13 Thread Brian Paul

The function is supposed to return a piglit_result, not true/false.
Fixes incorrect 'fail' results.
---
 tests/general/degenerate-prims.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/general/degenerate-prims.c b/tests/general/degenerate-prims.c
index 0eed99c..3001d34 100644
--- a/tests/general/degenerate-prims.c
+++ b/tests/general/degenerate-prims.c
@@ -72,7 +72,7 @@ test_prim(void *_data)
piglit_report_subtest_result(pass ? PIGLIT_PASS : PIGLIT_FAIL,
 "Primitive: %s", 
piglit_get_prim_name(data->prim));
 
-   return pass;
+   return pass ? PIGLIT_PASS : PIGLIT_FAIL;
 }
 
 
-- 
2.7.4

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] gl-4.3-get_glsl_versions: new tests of GL_NUM_SHADING_LANGUAGE_VERSIONS

2018-02-13 Thread Brian Paul

and glGetStringi(GL_SHADING_LANGUAGE_VERSION, i) queries in GL 4.3.
Until recently, these queries were not implemented in Mesa.
---
 tests/all.py  |  5 +++
 tests/spec/CMakeLists.txt |  1 +
 tests/spec/gl-4.3/CMakeLists.gl.txt   | 13 ++
 tests/spec/gl-4.3/CMakeLists.txt  |  1 +
 tests/spec/gl-4.3/get_glsl_versions.c | 76 +++
 5 files changed, 96 insertions(+)
 create mode 100644 tests/spec/gl-4.3/CMakeLists.gl.txt
 create mode 100644 tests/spec/gl-4.3/CMakeLists.txt
 create mode 100644 tests/spec/gl-4.3/get_glsl_versions.c

diff --git a/tests/all.py b/tests/all.py
index 310161a..8236d5a 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1208,6 +1208,11 @@ with profile.test_list.group_manager(
 
 with profile.test_list.group_manager(
 PiglitGLTest,
+grouptools.join('spec', '!opengl 4.3')) as g:
+g(['get_glsl_versions'])
+
+with profile.test_list.group_manager(
+PiglitGLTest,
 grouptools.join('spec', '!opengl 4.4')) as g:
 g(['tex-errors'])
 
diff --git a/tests/spec/CMakeLists.txt b/tests/spec/CMakeLists.txt
index 1f9d810..e57e8d7 100644
--- a/tests/spec/CMakeLists.txt
+++ b/tests/spec/CMakeLists.txt
@@ -134,6 +134,7 @@ add_subdirectory (gl-3.0)
 add_subdirectory (gl-3.1)
 add_subdirectory (gl-3.2)
 add_subdirectory (gl-3.3)
+add_subdirectory (gl-4.3)
 add_subdirectory (gl-4.4)
 add_subdirectory (gl-4.5)
 add_subdirectory (gles-2.0)
diff --git a/tests/spec/gl-4.3/CMakeLists.gl.txt 
b/tests/spec/gl-4.3/CMakeLists.gl.txt
new file mode 100644
index 000..4d81c84
--- /dev/null
+++ b/tests/spec/gl-4.3/CMakeLists.gl.txt
@@ -0,0 +1,13 @@
+include_directories(
+   ${GLEXT_INCLUDE_DIR}
+   ${OPENGL_INCLUDE_PATH}
+)
+
+link_libraries (
+   piglitutil_${piglit_target_api}
+   ${OPENGL_gl_LIBRARY}
+)
+
+piglit_add_executable (gl-4.3-get_glsl_versions get_glsl_versions.c)
+
+# vim: ft=cmake:
diff --git a/tests/spec/gl-4.3/CMakeLists.txt b/tests/spec/gl-4.3/CMakeLists.txt
new file mode 100644
index 000..144a306
--- /dev/null
+++ b/tests/spec/gl-4.3/CMakeLists.txt
@@ -0,0 +1 @@
+piglit_include_target_api()
diff --git a/tests/spec/gl-4.3/get_glsl_versions.c 
b/tests/spec/gl-4.3/get_glsl_versions.c
new file mode 100644
index 000..4a6d42d
--- /dev/null
+++ b/tests/spec/gl-4.3/get_glsl_versions.c
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2017 VMware, Inc.
+ *
+ * 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
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, 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 (including the next
+ * paragraph) 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
+ * NON-INFRINGEMENT.  IN NO EVENT SHALL AUTHORS AND/OR THEIR SUPPLIERS
+ * 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.
+ */
+
+
+#include "piglit-util-gl.h"
+#include "minmax-test.h"
+
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+   config.supports_gl_core_version = 43;
+   config.khr_no_error_support = PIGLIT_NO_ERRORS;
+PIGLIT_GL_TEST_CONFIG_END
+
+
+void
+piglit_init(int argc, char *argv[])
+{
+   GLint num = -1;
+   GLint i;
+
+   glGetIntegerv(GL_NUM_SHADING_LANGUAGE_VERSIONS, );
+   if (!piglit_check_gl_error(GL_NO_ERROR)) {
+   piglit_report_result(PIGLIT_FAIL);
+   }
+   if (num < 1) {
+   printf("Invalid number of shading language versions\n");
+   piglit_report_result(PIGLIT_FAIL);
+   }
+
+   for (i = 0; i < num; i++) {
+   const GLubyte *v = glGetStringi(GL_SHADING_LANGUAGE_VERSION, i);
+   if (!v) {
+   printf("Invalid glGetStringi(index=%d) result\n", i);
+   piglit_report_result(PIGLIT_FAIL);
+   }
+   if (v[0] != 0 && !(v[0] >= '1' && v[0] <= '9')) {
+   printf("Invalid GLSL version string: %s\n", v);
+   piglit_report_result(PIGLIT_FAIL);
+   }
+   //printf("%d: %s\n", i, (const char *) v);
+   }
+
+   if (!piglit_check_gl_error(GL_NO_ERROR)) {
+   piglit_report_result(PIGLIT_FAIL);
+   }
+
+   piglit_report_result(PIGLIT_PASS);
+}
+
+
+enum piglit_result
+piglit_display(void)
+{
+

[Piglit] [PATCH] tests: Added a new NoContext test profile for the Khronos CTS runner

2018-02-13 Thread Andres Gomez

After:
https://github.com/KhronosGroup/VK-GL-CTS/commit/f06134c65f55a009bbe284d2b7c0e56dee0f70cd

The Khronos CTS runner added a new KHR-NoContext case list.

This new test profile will run this new subset.

Cc: Mark Janes 
Cc: Dylan Baker 
Cc: Juan A. Suarez Romero 
Signed-off-by: Andres Gomez 
---
 tests/khr_noctx.py | 79 ++
 1 file changed, 79 insertions(+)
 create mode 100644 tests/khr_noctx.py

diff --git a/tests/khr_noctx.py b/tests/khr_noctx.py
new file mode 100644
index 0..4cba8130d
--- /dev/null
+++ b/tests/khr_noctx.py
@@ -0,0 +1,79 @@
+# 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 NoContext 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_noctx -c foo -t gl43 would run only gl43 tests
+
+This integration requires some configuration in piglit.conf, or the
+use of environment variables.
+
+In piglit.conf one should set the following:
+[khr_noctx]:bin -- Path to the glcts binary
+[khr_noctx]: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_NOCTX_BIN -- environment equivalent of [khr_noctx]:bin
+PIGLIT_KHR_NOCTX_EXTRA_ARGS -- environment equivalent of
+[khr_noctx]: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_NOCTX_BIN', ('khr_noctx', 'bin'),
+   required=True)
+
+_EXTRA_ARGS = deqp.get_option('PIGLIT_KHR_NOCTX_EXTRA_ARGS', ('khr_noctx', 
'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-NoContext-cases.txt',
+  _EXTRA_ARGS)),
+),
+DEQPKHRTest)
-- 
2.15.1

___
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH] tests: Added a new GLES test profile for the Khronos CTS runner

2018-02-13 Thread Andres Gomez

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 
Cc: Dylan Baker 
Cc: Juan A. Suarez Romero 
Signed-off-by: Andres Gomez 
---
 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 0..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

Re: [Piglit] [PATCH] degenerate-prims: fix incorrect return value from test_prim()

[Piglit] [PATCH] degenerate-prims: fix incorrect return value from test_prim()

[Piglit] [PATCH] gl-4.3-get_glsl_versions: new tests of GL_NUM_SHADING_LANGUAGE_VERSIONS

[Piglit] [PATCH] tests: Added a new NoContext test profile for the Khronos CTS runner

[Piglit] [PATCH] tests: Added a new GLES test profile for the Khronos CTS runner

5 matches

Site Navigation

Mail list logo

Footer information