Currently we are building a single binary for both GL and GLES. However, it can only be added by either CMakelists.gl or .gles, but not both.
Instead, build two differente binaries, install each in the respective CMakelists, and add them both to tests/all.py. Signed-off-by: Daniel Kurtz <[email protected]> --- tests/all.py | 5 +++-- tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt | 2 +- tests/egl/spec/egl_khr_create_context/CMakeLists.gles2.txt | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/all.py b/tests/all.py index 7a4eb7d..bf696ee 100644 --- a/tests/all.py +++ b/tests/all.py @@ -3668,8 +3668,9 @@ egl_khr_create_context['invalid profile'] = plain_test('egl-create-context-inval egl_khr_create_context['3.2 core profile required'] = plain_test('egl-create-context-core-profile') egl_khr_create_context['pre-GL3.2 profile'] = plain_test('egl-create-context-pre-GL32-profile') egl_khr_create_context['verify GL flavor'] = plain_test('egl-create-context-verify-gl-flavor') -for api in ('gl', 'gles1', 'gles2', 'gles3'): - egl_khr_create_context['valid debug flag ' + api] = plain_test('egl-create-context-valid-flag-debug ' + api) +egl_khr_create_context['valid debug flag GL'] = plain_test('egl-create-context-valid-flag-debug-gl gl') +for api in ('gles1', 'gles2', 'gles3'): + egl_khr_create_context['valid debug flag ' + api] = plain_test('egl-create-context-valid-flag-debug-gles ' + api) egl_ext_client_extensions = Group() spec['EGL_EXT_client_extensions'] = egl_ext_client_extensions diff --git a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt index 84f8b51..7932df0 100644 --- a/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt +++ b/tests/egl/spec/egl_khr_create_context/CMakeLists.gl.txt @@ -20,6 +20,6 @@ piglit_add_executable (egl-create-context-invalid-profile invalid-profile.c comm piglit_add_executable (egl-create-context-pre-GL32-profile pre-GL32-profile.c common.c) piglit_add_executable (egl-create-context-valid-flag-forward-compatible-gl valid-flag-forward-compatible-gl.c common.c) piglit_add_executable (egl-create-context-core-profile core-profile.c common.c) -piglit_add_executable (egl-create-context-valid-flag-debug valid-flag-debug.c common.c) +piglit_add_executable (egl-create-context-valid-flag-debug-gl valid-flag-debug.c common.c) # vim: ft=cmake: 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..96413d3 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-gles valid-flag-debug.c common.c) # vim: ft=cmake: -- 1.8.5.1 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
