Commit 56d44c80 authored by Nicolai Hähnle's avatar Nicolai Hähnle

Workaround window manager disrupting test in some cases

parent e8cd19c1
......@@ -29,6 +29,7 @@ import re
import stat
import subprocess
import sys
import time
import traceback
__all__ = [
......@@ -275,6 +276,7 @@ class Environment:
class Test:
ignoreErrors = []
sleep = 0
def __init__(self):
pass
......@@ -305,6 +307,8 @@ class Test:
print " result: %(result)s" % { 'result': result['result'] }
result.write(env.file,path)
if Test.sleep:
time.sleep(Test.sleep)
else:
print "Dry-run: %(path)s" % locals()
......@@ -345,6 +349,7 @@ class Group(dict):
class TestProfile:
def __init__(self):
self.tests = Group()
self.sleep = 0
def run(self, env):
self.tests.doRun(env, '')
......@@ -356,7 +361,7 @@ class TestProfile:
def loadTestProfile(filename):
try:
ns = {
'__file__': filename,
'__file__': filename
}
execfile(filename, ns)
return ns['profile']
......
......@@ -20,6 +20,12 @@ Test.ignoreErrors.append(re.compile('3D driver claims to not support'))
# Debug info
Test.ignoreErrors.append(re.compile('Try R300_SPAN_DISABLE_LOCKING env var if this hangs.'))
# Some window managers can be confusing for some of the tests because they
# send resize / move events that invalidate frame buffer contents.
# It would be nice to fix these things in a reliable way, but for now
# this workaround of waiting between tests helps...
Test.sleep = 0.2
# glean/blendFunc
# R300 blending hardware appears to be bad
......@@ -32,7 +38,6 @@ env['GLEAN_BLEND_ALPHA_TOLERANCE'] = 2.0
env = profile.tests['glean']['exactRGBA'].env
env['GLEAN_EXACTRGBA_ROUNDING'] = 1
# Tests specific to r300
r300 = Group()
# Apparently, LOD calculations are off a little for small MIP levels.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment