[Piglit] [PATCH 5/5] all.tests: Move GLES2 tests into all.tests

[Chad Versace]

No one runs the GLES2 tests. That needs to be fixed.
This patch moves the content of all_es2.tests into all.tests.

If you don't build the GLES2 tests, then piglit-run.py will skip them.

CC: Eric Anholt <eric at anholt.net>
CC: Kenneth Graunke <kenneth at whitecape.org>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/all.tests     |  5 +++++
 tests/all_es2.tests | 24 ------------------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 tests/all_es2.tests

diff --git a/tests/all.tests b/tests/all.tests
index dab0273..b89f32b 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2619,6 +2619,10 @@ add_asmparsertest('ARBvp1.0', 'txq-19.txt')
 add_asmparsertest('ARBvp1.0', 'txq-20.txt')
 add_asmparsertest('ARBvp1.0', 'xpd.txt')
 
+ext_unpack_subimage = Group()
+spec['EXT_unpack_subimage'] = ext_unpack_subimage
+ext_unpack_subimage['basic'] = concurrent_test('ext_unpack_subimage')
+
 oes_draw_texture = Group()
 spec['OES_draw_texture'] = oes_draw_texture
 oes_draw_texture['oes_draw_texture'] = concurrent_test('oes_draw_texture')
@@ -2626,6 +2630,7 @@ 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_etc1_rgb8_texture['miptree'] = concurrent_test('oes_compressed_etc1_rgb8_texture-miptree')
 
 oes_compressed_paletted_texture = Group()
 spec['OES_compressed_paletted_texture'] = oes_compressed_paletted_texture
diff --git a/tests/all_es2.tests b/tests/all_es2.tests
deleted file mode 100644
index ac1b636..0000000
--- a/tests/all_es2.tests
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# All GLESv2 tests that come with piglit, using default settings
-
-from framework.core import *
-from framework.exectest import *
-
-######
-# Collecting all tests
-profile = TestProfile()
-
-spec = Group()
-
-# Group ext_unpack_subimage
-ext_unpack_subimage = Group()
-spec['EXT_unpack_subimage'] = ext_unpack_subimage
-ext_unpack_subimage['basic'] = PlainExecTest(['ext_unpack_subimage', '-auto'])
-ext_unpack_subimage['basic'].runConcurrent = True
-
-oes_compressed_etc1_rgb8_texture = Group()
-spec['OES_compressed_ETC1_RGB8_texture'] = oes_compressed_etc1_rgb8_texture
-oes_compressed_etc1_rgb8_texture['miptree'] = PlainExecTest(['oes_compressed_etc1_rgb8_texture-miptree', '-auto'])
-
-profile.tests['spec'] = spec
-- 
1.7.11.7