[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.
If you don't build the GLES2 tests, then piglit-run.py will skip them.

all.tests is getting *very* bloated. Let's be honest... it's an
unmaintainable mess. So, rather than add to its unmaintainability, this
splits all_es2.tests into one file per extension directory:
  tests/spec/ext_unpack_subimage/tests.py
  tests/spec/oes_compressed_etc1_rgb8_texture/tests.py

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/all.tests                                    |  1 +
 tests/all_es2.tests                                | 24 ----------------------
 tests/spec/ext_unpack_subimage/tests.py            |  3 +++
 .../spec/oes_compressed_etc1_rgb8_texture/tests.py |  1 +
 4 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 tests/all_es2.tests
 create mode 100644 tests/spec/ext_unpack_subimage/tests.py

diff --git a/tests/all.tests b/tests/all.tests
index 521eec9..888013a 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2635,6 +2635,7 @@ if platform.system() is not 'Windows':
 
 execfile(path.join(testsDir, 'egl', 'tests.py'))
 execfile(path.join(testsDir, 'egl', 'spec', 'egl_khr_create_context', 'tests.py'))
+execfile(path.join(testsDir, 'spec', 'ext_unpack_subimage', 'tests.py'))
 execfile(path.join(testsDir, 'spec', 'oes_compressed_etc1_rgb8_texture', 'tests.py'))
 execfile(path.join(testsDir, 'spec', 'oes_compressed_paletted_texture', 'tests.py'))
 execfile(path.join(testsDir, 'spec', 'oes_draw_texture', 'tests.py'))
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
diff --git a/tests/spec/ext_unpack_subimage/tests.py b/tests/spec/ext_unpack_subimage/tests.py
new file mode 100644
index 0000000..64e3573
--- /dev/null
+++ b/tests/spec/ext_unpack_subimage/tests.py
@@ -0,0 +1,3 @@
+ext_unpack_subimage = Group()
+spec['EXT_unpack_subimage'] = ext_unpack_subimage
+ext_unpack_subimage['basic'] = concurrent_test('ext_unpack_subimage')
diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py b/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
index b3bbd40..dc16848 100644
--- a/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
@@ -1,3 +1,4 @@
 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')
-- 
1.7.11.7