[Piglit] [PATCH] tests lists: Fix cpu/gpu test lists

[Dylan Baker]

For some reason that isn't recorded ARB_fragment_program and
ARB_vertex_program were being removed form gpu.py and thus added in
cpu.py, which is incorrect, these tests are actually rendering on the
GPU, and therefore cannot be included in cpu.py but should be in gpu.py

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/cpu.py | 10 +---------
 tests/gpu.py |  4 +---
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests/cpu.py b/tests/cpu.py
index be0e72a..d3f9f88 100644
--- a/tests/cpu.py
+++ b/tests/cpu.py
@@ -18,16 +18,8 @@ __all__ = ['profile']
 
 def filter_gpu(name, test):
     """Remove all tests that are run on the GPU."""
-    if isinstance(test, GLSLParserTest):
+    if isinstance(test, GLSLParserTest) or name.startswith('asmparsertest'):
         return True
-
-    if name.startswith('spec/ARB_vertex_program'):
-        return True
-    if name.startswith('spec/ARB_fragment_program'):
-        return True
-    if name.startswith('asmparsertest'):
-        return True
-
     return False
 
 
diff --git a/tests/gpu.py b/tests/gpu.py
index 49bdfa6..1c1a79a 100644
--- a/tests/gpu.py
+++ b/tests/gpu.py
@@ -10,7 +10,5 @@ __all__ = ['profile']
 # Remove all glsl_parser_tests, as they are compiler test
 profile.filter_tests(lambda p, t: not isinstance(t, GLSLParserTest))
 
-# Drop ARB_vertex_program/ARB_fragment_program compiler tests.
-del profile.tests['spec']['ARB_vertex_program']
-del profile.tests['spec']['ARB_fragment_program']
+# Remove asmparasertests as well, since they're parser tests.
 del profile.tests['asmparsertest']
-- 
2.2.0