No one runs the EGL tests. That needs to be fixed. This patch moves the content of all_egl.tests into all.tests.
If you don't build the EGL tests, then piglit-run.py will skip them. CC: Eric Anholt <[email protected]> CC: Kenneth Graunke <[email protected]> Signed-off-by: Chad Versace <[email protected]> --- tests/all.tests | 37 +++++++++++++++++++++++++++++++++++++ tests/all_egl.tests | 45 --------------------------------------------- 2 files changed, 37 insertions(+), 45 deletions(-) delete mode 100644 tests/all_egl.tests diff --git a/tests/all.tests b/tests/all.tests index 0cfdc65..8070621 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -2619,6 +2619,43 @@ add_asmparsertest('ARBvp1.0', 'txq-19.txt') add_asmparsertest('ARBvp1.0', 'txq-20.txt') add_asmparsertest('ARBvp1.0', 'xpd.txt') +egl14 = Group() +spec['EGL 1.4'] = egl14 +egl14['eglCreateSurface'] = plain_test('egl-create-surface') +egl14['eglQuerySurface EGL_BAD_ATTRIBUTE'] = plain_test('egl-query-surface --bad-attr') +egl14['eglQuerySurface EGL_BAD_SURFACE'] = plain_test('egl-query-surface --bad-surface') +egl14['eglQuerySurface EGL_HEIGHT'] = plain_test('egl-query-surface --attr=EGL_HEIGHT') +egl14['eglQuerySurface EGL_WIDTH'] = plain_test('egl-query-surface --attr=EGL_WIDTH') + +egl_nok_swap_region = Group() +spec['EGL_NOK_swap_region'] = egl_nok_swap_region +egl_nok_swap_region['basic'] = plain_test('egl-nok-swap-region') + +egl_nok_texture_from_pixmap = Group() +spec['EGL_NOK_texture_from_pixmap'] = egl_nok_texture_from_pixmap +egl_nok_texture_from_pixmap['basic'] = plain_test('egl-nok-texture-from-pixmap') + +egl_khr_create_context = Group(); +spec['EGL_KHR_create_context'] = egl_khr_create_context +egl_khr_create_context['default major version GLES'] = plain_test('egl-create-context-default-major-version-gles') +egl_khr_create_context['default major version GL'] = plain_test('egl-create-context-default-major-version-gl') +egl_khr_create_context['default minor version GLES'] = plain_test('egl-create-context-default-minor-version-gles') +egl_khr_create_context['default minor version GL'] = plain_test('egl-create-context-default-minor-version-gl') +egl_khr_create_context['valid attribute empty GLES'] = plain_test('egl-create-context-valid-attribute-empty-gles') +egl_khr_create_context['valid attribute empty GL'] = plain_test('egl-create-context-valid-attribute-empty-gl') +egl_khr_create_context['NULL valid attribute GLES'] = plain_test('egl-create-context-valid-attribute-null-gles') +egl_khr_create_context['NULL valid attribute GL'] = plain_test('egl-create-context-valid-attribute-null-gl') +egl_khr_create_context['invalid OpenGL version'] = plain_test('egl-create-context-invalid-gl-version') +egl_khr_create_context['invalid attribute GLES'] = plain_test('egl-create-context-invalid-attribute-gles') +egl_khr_create_context['invalid attribute GL'] = plain_test('egl-create-context-invalid-attribute-gl') +egl_khr_create_context['invalid flag GLES'] = plain_test('egl-create-context-invalid-flag-gles') +egl_khr_create_context['invalid flag GL'] = plain_test('egl-create-context-invalid-flag-gl') +egl_khr_create_context['valid forward-compatible flag GL'] = plain_test('egl-create-context-valid-flag-forward-compatible-gl') +egl_khr_create_context['invalid profile'] = plain_test('egl-create-context-invalid-profile') +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') + add_shader_test_dir(spec, os.path.join(generatedTestDir, 'spec'), recursive=True) import_glsl_parser_tests(profile.tests, generatedTestDir, ['spec']) diff --git a/tests/all_egl.tests b/tests/all_egl.tests deleted file mode 100644 index 56cdf6e..0000000 --- a/tests/all_egl.tests +++ /dev/null @@ -1,45 +0,0 @@ -import shlex - -from framework.core import * -from framework.exectest import * - -def plain_test(args): - return PlainExecTest(shlex.split(args) + ['-auto']) - -def concurrent_test(args): - test = PlainExecTest(args.split() + ['-auto']) - test.runConcurrent = True - return test - -profile = TestProfile() - -egl = Group() -profile.tests['egl'] = egl -egl['egl-create-surface'] = plain_test('egl-create-surface') -egl['egl-nok-swap-region'] = plain_test('egl-nok-swap-region') -egl['egl-nok-texture-from-pixmap'] = plain_test('egl-nok-texture-from-pixmap') -egl['egl-query-surface-EGL_BAD_ATTRIBUTE'] = plain_test('egl-query-surface --bad-attr') -egl['egl-query-surface-EGL_BAD_SURFACE'] = plain_test('egl-query-surface --bad-surface') -egl['egl-query-surface-EGL_HEIGHT'] = plain_test('egl-query-surface --attr=EGL_HEIGHT') -egl['egl-query-surface-EGL_WIDTH'] = plain_test('egl-query-surface --attr=EGL_WIDTH') - -create_context = Group(); -egl['EGL_KHR_create_context'] = create_context -create_context['default major version GLES'] = concurrent_test('egl-create-context-default-major-version-gles') -create_context['default major version GL'] = concurrent_test('egl-create-context-default-major-version-gl') -create_context['default minor version GLES'] = concurrent_test('egl-create-context-default-minor-version-gles') -create_context['default minor version GL'] = concurrent_test('egl-create-context-default-minor-version-gl') -create_context['valid attribute empty GLES'] = concurrent_test('egl-create-context-valid-attribute-empty-gles') -create_context['valid attribute empty GL'] = concurrent_test('egl-create-context-valid-attribute-empty-gl') -create_context['NULL valid attribute GLES'] = concurrent_test('egl-create-context-valid-attribute-null-gles') -create_context['NULL valid attribute GL'] = concurrent_test('egl-create-context-valid-attribute-null-gl') -create_context['invalid OpenGL version'] = concurrent_test('egl-create-context-invalid-gl-version') -create_context['invalid attribute GLES'] = concurrent_test('egl-create-context-invalid-attribute-gles') -create_context['invalid attribute GL'] = concurrent_test('egl-create-context-invalid-attribute-gl') -create_context['invalid flag GLES'] = concurrent_test('egl-create-context-invalid-flag-gles') -create_context['invalid flag GL'] = concurrent_test('egl-create-context-invalid-flag-gl') -create_context['valid forward-compatible flag GL'] = concurrent_test('egl-create-context-valid-flag-forward-compatible-gl') -create_context['invalid profile'] = concurrent_test('egl-create-context-invalid-profile') -create_context['3.2 core profile required'] = concurrent_test('egl-create-context-core-profile') -create_context['pre-GL3.2 profile'] = concurrent_test('egl-create-context-pre-GL32-profile') -create_context['verify GL flavor'] = concurrent_test('egl-create-context-verify-gl-flavor') -- 1.7.11.7 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
