[Piglit] [PATCH] framework: resmove es3conform support

[baker.dylan.c at gmail.com]

From: Dylan Baker <baker.dylan.c at gmail.com>

This is the old Khronos suite, which has been superseded by CTS. Since
piglit can wrap cts it seems rather silly to have both CTS and
es3conform support.

cc: Eric Anholt <eric at anholt.net>
Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---

Eric, I thought I'd ping you to see if you still needed this. If it's
still useful just let me know and I'll drop this, but I just wanted to
make sure we weren't carrying it around when CTS was sufficient.

 framework/tests/integration_tests.py | 11 -----
 tests/es3conform.py                  | 88 ------------------------------------
 2 files changed, 99 deletions(-)
 delete mode 100644 tests/es3conform.py

diff --git a/framework/tests/integration_tests.py b/framework/tests/integration_tests.py
index dc584b3..44a72f4 100644
--- a/framework/tests/integration_tests.py
+++ b/framework/tests/integration_tests.py
@@ -82,17 +82,6 @@ def test_igt_igttest():
     mod.IGTTest('foo')
 
 
-def test_es3conform_import():
-    """ es3conform.py can be imported """
-    _import('tests.es3conform')
-
-
-def test_es3conform_gtftest():
-    """ es3conform.GTFTest initializes """
-    mod = _import('tests.es3conform')
-    mod.GTFTest('testpath')
-
-
 def test_oglconform_import():
     """ oglconform.py can be imported """
     _import('tests.oglconform')
diff --git a/tests/es3conform.py b/tests/es3conform.py
deleted file mode 100644
index 53c2fc4..0000000
--- a/tests/es3conform.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-#
-# This permission notice shall be included in all copies or
-# substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-# PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHOR(S) BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-# OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-
-import re
-from os import path
-
-from framework.profile import TestProfile
-from framework.test import TEST_BIN_DIR, Test
-from framework import grouptools, exceptions
-
-__all__ = ['profile']
-
-#############################################################################
-# GTFTest: Execute a sub-test of the Khronos ES 3.0 Conformance suite.
-#
-# To use this, create a 'GTF3' symlink in piglit/bin which points to the
-# Khronos 'GTF' executable.  Piglit will automatically add all .test
-# files into the 'gtf' category.
-#############################################################################
-
-if not path.exists(path.join(TEST_BIN_DIR, 'GTF3')):
-    raise exceptions.PiglitFatalError(
-        'Missing GTF3 symlink. Unable to run es3conform tests.')
-
-profile = TestProfile()
-
-# Chase the piglit/bin/GTF symlink to find where the tests really live.
-gtfroot = path.dirname(path.realpath(path.join(TEST_BIN_DIR, 'GTF3')))
-
-
-class GTFTest(Test):
-    pass_re = re.compile(
-        r'(Conformance|Regression) PASSED all (?P<passed>\d+) tests')
-
-    def __init__(self, testpath):
-        super(GTFTest, self).__init__([path.join(TEST_BIN_DIR, 'GTF3'),
-                                       '-minfmt', '-width=113', '-height=47',
-                                       '-run=' + testpath])
-
-    def interpret_result(self):
-        mo = self.pass_re.search(self.result.out)
-        if mo is not None and int(mo.group('passed')) > 0:
-            self.result.result = 'pass'
-        else:
-            self.result.result = 'fail'
-
-
-def populateTests(runfile):
-    "Read a .run file, adding any .test files to the profile"
-    with open(runfile, 'r') as f:
-        for line in f.readlines():
-            # Ignore comments and whitespace
-            line = line.strip()
-            if line.startswith('#') or line == '':
-                continue
-
-            newpath = path.join(path.dirname(runfile), line)
-            if line.endswith('.run'):
-                populateTests(newpath)
-            else:
-                # Add the .test file
-                group = grouptools.join(
-                    'es3conform',
-                    grouptools.from_path(path.relpath(newpath, gtfroot)))
-                profile.test_list[group] = GTFTest(newpath)
-
-
-# Populate the group with all the .test files
-populateTests(path.join(gtfroot, 'mustpass_es30.run'))
-- 
2.6.2