[Piglit] [PATCH 2/2] egl: Add sanity test for EGL_EXT_device_enumeration (v3)

[Eric Anholt]

Adam Jackson <ajax at redhat.com> writes:

> v2:
> - Cover more error paths (Eric Anholt)
>
> v3:
> - Use piglit_check_egl_error and PFN* typedefs (Emil Velikov)
> - Don't initialize a display, just query; future tests will inspect
>   particular device and platform types (Mathias Frölich)
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>
> ---
>  tests/all.py                                       |  6 ++
>  tests/egl/spec/CMakeLists.txt                      |  1 +
>  .../CMakeLists.no_api.txt                          |  7 ++
>  .../spec/egl_ext_device_enumeration/CMakeLists.txt |  1 +
>  .../egl_ext_device_enumeration.c                   | 96 ++++++++++++++++++++++
>  5 files changed, 111 insertions(+)
>  create mode 100644 tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
>  create mode 100644 tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
>  create mode 100644 tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
>
> diff --git a/tests/all.py b/tests/all.py
> index ca3472b..3071459 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4534,6 +4534,12 @@ with profile.group_manager(
>      g(['egl_ext_device_query'], 'conformance')
>  
>  with profile.group_manager(
> +        PiglitGLTest,
> +        grouptools.join('spec', 'egl_ext_device_enumeration'),
> +        exclude_platforms=['glx']) as g:
> +    g(['egl_ext_device_enumeration'], 'conformance')
> +
> +with profile.group_manager(
>          PiglitGLTest, grouptools.join('spec', '!opengl ES 2.0')) as g:
>      g(['glsl-fs-pointcoord_gles2'], 'glsl-fs-pointcoord')
>      g(['invalid-es3-queries_gles2'])
> diff --git a/tests/egl/spec/CMakeLists.txt b/tests/egl/spec/CMakeLists.txt
> index 0868cc0..7206556 100644
> --- a/tests/egl/spec/CMakeLists.txt
> +++ b/tests/egl/spec/CMakeLists.txt
> @@ -1,6 +1,7 @@
>  add_subdirectory (egl-1.4)
>  add_subdirectory (egl_ext_client_extensions)
>  add_subdirectory (egl_ext_device_query)
> +add_subdirectory (egl_ext_device_enumeration)
>  add_subdirectory (egl_khr_create_context)
>  add_subdirectory (egl_khr_get_all_proc_addresses)
>  add_subdirectory (egl_khr_fence_sync)
> diff --git a/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
> new file mode 100644
> index 0000000..381f080
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.no_api.txt
> @@ -0,0 +1,7 @@
> +link_libraries(
> +	piglitutil
> +)
> +
> +piglit_add_executable(egl_ext_device_enumeration egl_ext_device_enumeration.c)
> +
> +# vim: ft=cmake:
> diff --git a/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
> new file mode 100644
> index 0000000..144a306
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/CMakeLists.txt
> @@ -0,0 +1 @@
> +piglit_include_target_api()
> diff --git a/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c b/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
> new file mode 100644
> index 0000000..d35d23a
> --- /dev/null
> +++ b/tests/egl/spec/egl_ext_device_enumeration/egl_ext_device_enumeration.c
> @@ -0,0 +1,96 @@
> +/*
> + * Copyright © 2016 Red Hat, Inc.
> + * Copyright 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 (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 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.
> + */
> +
> +#include "piglit-util.h"
> +#include "piglit-util-egl.h"
> +
> +int
> +main(void)
> +{
> +	EGLint i, numdevs;
> +	EGLDeviceEXT devs[1024];
> +	PFNEGLQUERYDEVICESEXTPROC queryDevices;
> +
> +	const char *client_exts = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
> +	bool has_client_ext =
> +		client_exts &&
> +		piglit_is_extension_in_string(client_exts,
> +			"EGL_EXT_device_query") &&
> +		piglit_is_extension_in_string(client_exts,
> +			"EGL_EXT_device_enumeration");
> +
> +	if (!has_client_ext) {
> +		printf("EGL_EXT_device_enumeration not supported\n");
> +		piglit_report_result(PIGLIT_SKIP);
> +	}
> +
> +	queryDevices = (void *)eglGetProcAddress("eglQueryDevicesEXT");
> +
> +	if (!queryDevices) {
> +		printf("No device query entrypoint\n");
> +		piglit_report_result(PIGLIT_FAIL);
> +	}
> +
> +	if (queryDevices(0, NULL, &numdevs)) {
> +		printf("Failed to get device count\n");
> +		piglit_report_result(PIGLIT_FAIL);
> +	}
> +
> +	if (numdevs < 1) {
> +		printf("No devices supported\n");
> +		piglit_report_result(PIGLIT_FAIL);
> +	}
> +
> +	memset(devs, 0, sizeof devs);
> +	if (!queryDevices(numdevs, devs, &numdevs)) {
> +		printf("Failed to enumerate devices\n");
> +		piglit_report_result(PIGLIT_FAIL);
> +	}

There's still a problem if numdevs was > ARRAY_SIZE(devs), because we'd
smash the stack.  I think an easy fix for the test would be to just
numdevs = MIN2(devs, ARRAY_SIZE(devs)) before this call.  But 1024 devs
is kind of nuts, and I want to see these extensions getting tested, so
either way the series is:

Reviewed-by: Eric Anholt <eric at anholt.net>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <https://lists.freedesktop.org/archives/piglit/attachments/20160831/b32b23ec/attachment.sig>