[Piglit] [PATCH 8/8] egl_khr_create_context: Add valid-flag-debug tests to GLES CMakeLists
Chad Versace
chad.versace at linux.intel.com
Fri Jan 10 10:30:56 PST 2014
On Tue, Jan 07, 2014 at 12:02:43AM +0800, Daniel Kurtz wrote:
> Add these gles specific tests to CMakelists so they will be built when
> targeting GLES.
>
> Signed-off-by: Daniel Kurtz <djkurtz at chromium.org>
> ---
> tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt b/tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt
> index dde8960..c629888 100644
> --- a/tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt
> +++ b/tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt
> @@ -27,5 +27,6 @@ piglit_add_executable (egl-create-context-invalid-flag-gles invalid-flag-gles.c
> # Tests that use ES 1, ES 2, and Desktop GL.
> piglit_add_executable (egl-create-context-invalid-gl-version invalid-gl-version.c common.c)
> piglit_add_executable (egl-create-context-verify-gl-flavor verify-gl-flavor.c common.c)
> +piglit_add_executable (egl-create-context-valid-flag-debug valid-flag-debug.c common.c)
NAK
This patch breaks the Piglit build. In CMake, it's illegal to for
a target name to have multiple definitions. And
egl-create-context-valid-flag-debug is already defined in
CMakeLists.gl.txt.
There's a quick and dirty way to fix this patch: Remove the definition
of egl-create-context-valid-flag-debug. But then the test no longer gets
built when a user builds Piglit for only GL.
I think the correct solution here is to move *all*
EGL_KHR_create_context tests to CMakeLists.no_api.txt, and ensure that
none of them link to any libGL*.
I'm largely responsible for the Piglit's complex CMakeLists.${api}.txt
system, so I'll try to submit a patch today to move all these tests to
CMakeLists.no_api.txt.
More information about the Piglit
mailing list