No one runs the GLES1 tests. That needs to be fixed. This patch moves the content of all_es1.tests into all.tests.
If you don't build the GLES1 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 | 12 ++++++++++++ tests/all_es1.tests | 32 -------------------------------- 2 files changed, 12 insertions(+), 32 deletions(-) delete mode 100644 tests/all_es1.tests diff --git a/tests/all.tests b/tests/all.tests index 8070621..dab0273 100644 --- a/tests/all.tests +++ b/tests/all.tests @@ -2619,6 +2619,18 @@ add_asmparsertest('ARBvp1.0', 'txq-19.txt') add_asmparsertest('ARBvp1.0', 'txq-20.txt') add_asmparsertest('ARBvp1.0', 'xpd.txt') +oes_draw_texture = Group() +spec['OES_draw_texture'] = oes_draw_texture +oes_draw_texture['oes_draw_texture'] = concurrent_test('oes_draw_texture') + +oes_compressed_etc1_rgb8_texture = Group() +spec['OES_compressed_ETC1_RGB8_texture'] = oes_compressed_etc1_rgb8_texture +oes_compressed_etc1_rgb8_texture['basic'] = concurrent_test('oes_compressed_etc1_rgb8_texture-basic') + +oes_compressed_paletted_texture = Group() +spec['OES_compressed_paletted_texture'] = oes_compressed_paletted_texture +oes_compressed_paletted_texture['basic API'] = concurrent_test('oes_compressed_paletted_texture-api') + egl14 = Group() spec['EGL 1.4'] = egl14 egl14['eglCreateSurface'] = plain_test('egl-create-surface') diff --git a/tests/all_es1.tests b/tests/all_es1.tests deleted file mode 100644 index eb478ed..0000000 --- a/tests/all_es1.tests +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# All GLESv1 tests that come with piglit, using default settings - -from framework.core import * -from framework.exectest import * - -###### -# Collecting all tests -profile = TestProfile() - -spec = Group() - -# Group oes_compressed_etc1_rgb8_texture -oes_compressed_etc1_rgb8_texture = Group() -spec['OES_compressed_ETC1_RGB8_texture'] = oes_compressed_etc1_rgb8_texture -oes_compressed_etc1_rgb8_texture['basic'] = PlainExecTest(['oes_compressed_etc1_rgb8_texture-basic', '-auto']) -oes_compressed_etc1_rgb8_texture['basic'].runConcurrent = True - -# Group OES_compressed_paletted_texture -oes_compressed_paletted_texture = Group() -spec['OES_compressed_paletted_texture'] = oes_compressed_paletted_texture -oes_compressed_paletted_texture['basic API'] = PlainExecTest(['oes_compressed_paletted_texture-api', '-auto']) -oes_compressed_paletted_texture['basic API'].runConcurrent = True - -# Group OES_draw_texture -oes_draw_texture = Group() -spec['OES_draw_texture'] = oes_draw_texture -oes_draw_texture['oes_draw_texture'] = PlainExecTest(['oes_draw_texture', '-auto']) -oes_draw_texture['oes_draw_texture'].runConcurrent = True - -profile.tests['spec'] = spec -- 1.7.11.7 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
