Refactoring

3 files changed, 33 insertions, 20 deletions

diff --git a/tests/all.tests b/tests/all.tests
index 3c8f5f5fc..c3da24a07 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -4,12 +4,14 @@
 import re
 import subprocess
 
+from framework.core import *
+from framework.exectest import *
+from framework.gleantest import *
+
 ######
 # Glean sub-tests
 glean_fragprog1 = Group()
 
-print gleanExecutable()
-
 out,err = subprocess.Popen(
 	[gleanExecutable(), "-t", "+fragProg1", "--listdetails"],
 	stdout=subprocess.PIPE
@@ -34,6 +36,8 @@ for line in out.split('\n'):
 
 ######
 # Collecting all tests
+profile = TestProfile()
+
 glean = Group()
 glean['basic'] = GleanTest('basic')
 glean['makeCurrent'] = GleanTest('makeCurrent')
@@ -69,25 +73,24 @@ glean['vertattrib'] = GleanTest('vertattrib')
 glean['vertProg1'] = GleanTest('vertProg1')
 
 mesa = Group()
-mesa['crossbar'] = PlainExecTest([testbin + 'crossbar', '-auto'])
+mesa['crossbar'] = PlainExecTest([testBinDir + 'crossbar', '-auto'])
 
 shaders = Group()
-shaders['trinity-fp1'] = PlainExecTest([testbin + 'trinity-fp1', '-auto'])
-shaders['fp-lit-mask'] = PlainExecTest([testbin + 'fp-lit-mask', '-auto'])
-shaders['fp-fragment-position'] = PlainExecTest([testbin + 'fp-fragment-position', '-auto'])
-shaders['fp-kil'] = PlainExecTest([testbin + 'fp-kil', '-auto'])
-shaders['fp-incomplete-tex'] = PlainExecTest([testbin + 'fp-incomplete-tex', '-auto'])
+shaders['trinity-fp1'] = PlainExecTest([testBinDir + 'trinity-fp1', '-auto'])
+shaders['fp-lit-mask'] = PlainExecTest([testBinDir + 'fp-lit-mask', '-auto'])
+shaders['fp-fragment-position'] = PlainExecTest([testBinDir + 'fp-fragment-position', '-auto'])
+shaders['fp-kil'] = PlainExecTest([testBinDir + 'fp-kil', '-auto'])
+shaders['fp-incomplete-tex'] = PlainExecTest([testBinDir + 'fp-incomplete-tex', '-auto'])
 shaders['glean-fragProg1'] = glean_fragprog1
 
 bugs = Group()
-bugs['fdo9833'] = PlainExecTest([testbin + 'fdo9833', '-auto'])
-bugs['fdo10370'] = PlainExecTest([testbin + 'fdo10370', '-auto'])
+bugs['fdo9833'] = PlainExecTest([testBinDir + 'fdo9833', '-auto'])
+bugs['fdo10370'] = PlainExecTest([testBinDir + 'fdo10370', '-auto'])
 
-tests = Group()
-tests['bugs'] = bugs
-tests['glean'] = glean
-tests['mesa'] = mesa
-tests['shaders'] = shaders
+profile.tests['bugs'] = bugs
+profile.tests['glean'] = glean
+profile.tests['mesa'] = mesa
+profile.tests['shaders'] = shaders
 
 #############
 # Some Mesa diagnostic messages that we should probably ignore
diff --git a/tests/r300.tests b/tests/r300.tests
index 1f2547c73..ae401857a 100644
--- a/tests/r300.tests
+++ b/tests/r300.tests
@@ -3,7 +3,14 @@
 # Testing the r300 DRI driver
 #
 
-execfile(__dir__ + '/all.tests')
+import os
+
+execfile(os.path.dirname(__file__) + '/all.tests')
+
+from framework.core import *
+from framework.gleantest import *
+
+
 
 # Potentially serious problem, but workaround for now
 GleanTest.globalParams += [ '--visuals', 'id != 0x4b' ]
@@ -15,12 +22,12 @@ Test.ignoreErrors.append('Try R300_SPAN_DISABLE_LOCKING env var if this hangs.')
 
 # glean/blendFunc
 #   R300 blending hardware appears to be bad
-env = tests['glean']['blendFunc'].env
+env = profile.tests['glean']['blendFunc'].env
 env['GLEAN_BLEND_RGB_TOLERANCE'] = 1.9
 env['GLEAN_BLEND_ALPHA_TOLERANCE'] = 2.0
 
 # glean/exactRGBA
 #   insane OpenGL spec requirements
-env = tests['glean']['exactRGBA'].env
+env = profile.tests['glean']['exactRGBA'].env
 env['GLEAN_EXACTRGBA_ROUNDING'] = 1
 
diff --git a/tests/sanity.tests b/tests/sanity.tests
index d591c71f8..701a52092 100644
--- a/tests/sanity.tests
+++ b/tests/sanity.tests
@@ -3,8 +3,11 @@
 # Minimal tests to check whether the installation is working
 #
 
+from framework.core import *
+from framework.gleantest import *
+
 glean = Group()
 glean['basic'] = GleanTest('basic')
 
-tests = Group()
-tests['glean'] = glean
+profile = TestProfile()
+profile.tests['glean'] = glean