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

[Chad Versace]

No one runs the GLES1 tests. That needs to be fixed.
If you don't build the GLES1 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_es1.tests into one file per extension directory:
  tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
  tests/spec/oes_compressed_paletted_texture/tests.py
  tests/spec/oes_draw_texture/tests.py

Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 tests/all.tests                                    |  3 ++
 tests/all_es1.tests                                | 32 ----------------------
 .../spec/oes_compressed_etc1_rgb8_texture/tests.py |  3 ++
 .../spec/oes_compressed_paletted_texture/tests.py  |  3 ++
 tests/spec/oes_draw_texture/tests.py               |  3 ++
 5 files changed, 12 insertions(+), 32 deletions(-)
 delete mode 100644 tests/all_es1.tests
 create mode 100644 tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
 create mode 100644 tests/spec/oes_compressed_paletted_texture/tests.py
 create mode 100644 tests/spec/oes_draw_texture/tests.py

diff --git a/tests/all.tests b/tests/all.tests
index 7881c20..521eec9 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -2635,6 +2635,9 @@ 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', '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'))
 
 # Remove blacklisted tests
 for test_path in blacklist:
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
diff --git a/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py b/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
new file mode 100644
index 0000000..b3bbd40
--- /dev/null
+++ b/tests/spec/oes_compressed_etc1_rgb8_texture/tests.py
@@ -0,0 +1,3 @@
+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')
diff --git a/tests/spec/oes_compressed_paletted_texture/tests.py b/tests/spec/oes_compressed_paletted_texture/tests.py
new file mode 100644
index 0000000..5a43d99
--- /dev/null
+++ b/tests/spec/oes_compressed_paletted_texture/tests.py
@@ -0,0 +1,3 @@
+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')
diff --git a/tests/spec/oes_draw_texture/tests.py b/tests/spec/oes_draw_texture/tests.py
new file mode 100644
index 0000000..ed766dd
--- /dev/null
+++ b/tests/spec/oes_draw_texture/tests.py
@@ -0,0 +1,3 @@
+oes_draw_texture = Group()
+spec['OES_draw_texture'] = oes_draw_texture
+oes_draw_texture['oes_draw_texture'] = concurrent_test('oes_draw_texture')
-- 
1.7.11.7