[Piglit] [PATCH 05/11] framework: Move list of ignored errors to core rather than *.tests.
Kenneth Graunke
kenneth at whitecape.org
Wed Feb 1 16:06:32 PST 2012
all.tests includes a series of regular expressions to discard driver
chatter that Piglit shouldn't consider a warning. Unfortunately, it
got copy and pasted to a few more files.
Move it back into one place---in core. While we're at it, use `map' to
avoid having to write Test.ignoreErrors.append(re.compile(...)) every
time.
Signed-off-by: Kenneth Graunke <kenneth at whitecape.org>
---
framework/core.py | 42 ++++++++++++++++++++++++++++++++++++++++++
tests/all.tests | 39 ---------------------------------------
tests/all_egl.tests | 38 --------------------------------------
tests/all_es1.tests | 40 ----------------------------------------
4 files changed, 42 insertions(+), 117 deletions(-)
diff --git a/framework/core.py b/framework/core.py
index c818f7c..7204914 100644
--- a/framework/core.py
+++ b/framework/core.py
@@ -26,6 +26,7 @@ import errno
import json
import os
import platform
+import re
import stat
import subprocess
import sys
@@ -609,3 +610,44 @@ def loadTestResults(path):
assert(testrun.name is not None)
return testrun
+
+#############################################################################
+##### Error messages to be ignored
+#############################################################################
+Test.ignoreErrors = map(re.compile, [
+ "couldn't open libtxc_dxtn.so",
+ "compression/decompression available",
+ "Mesa: .*build",
+ "Mesa: CPU.*",
+ "Mesa: .*cpu detected.",
+ "Mesa: Test.*",
+ "Mesa: Yes.*",
+ "libGL: XF86DRIGetClientDriverName.*",
+ "libGL: OpenDriver: trying.*",
+ "libGL: Warning in.*drirc*",
+ "ATTENTION.*value of option.*",
+ "drmOpen.*",
+ "Mesa: Not testing OS support.*",
+ "Mesa: User error:.*",
+ "Mesa: Initializing .* optimizations",
+ "debug_get_.*",
+ "util_cpu_caps.*",
+ "Mesa: 3Dnow! detected",
+ "r300:.*",
+ "radeon:.*",
+ "Warning:.*",
+ "0 errors, .*",
+ "Mesa.*",
+ "no rrb",
+ "; ModuleID.*",
+ "%.*",
+ ".*failed to translate tgsi opcode.*to SSE",
+ ".*falling back to interpreter",
+ "GLSL version is .*, but requested version .* is required",
+ "kCGErrorIllegalArgument: CGSOrderWindowList",
+ "kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint\(\) to catch errors as they are logged.",
+ "stw_(init|cleanup).*",
+ "OpenGLInfo..*",
+ "AdapterInfo..*",
+ "No memory leaks detected.",
+])
diff --git a/tests/all.tests b/tests/all.tests
index d0f18b4..dac1394 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -3,7 +3,6 @@
import os
import os.path as path
-import re
from framework.core import *
from framework.exectest import *
@@ -2144,41 +2143,3 @@ for groupname, group in sorted(profile.tests.iteritems()):
valgrind[groupname+"/"+testname+"/"+subtestname] = ValgrindExecTest(subtest)
profile.tests['valgrind'] = valgrind
-
-#############
-# Some Mesa diagnostic messages that we should probably ignore
-Test.ignoreErrors.append(re.compile("couldn't open libtxc_dxtn.so"))
-Test.ignoreErrors.append(re.compile("compression/decompression available"))
-Test.ignoreErrors.append(re.compile("Mesa: .*build"))
-Test.ignoreErrors.append(re.compile("Mesa: CPU.*"))
-Test.ignoreErrors.append(re.compile("Mesa: .*cpu detected."))
-Test.ignoreErrors.append(re.compile("Mesa: Test.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Yes.*"))
-Test.ignoreErrors.append(re.compile("libGL: XF86DRIGetClientDriverName.*"))
-Test.ignoreErrors.append(re.compile("libGL: OpenDriver: trying.*"))
-Test.ignoreErrors.append(re.compile("libGL: Warning in.*drirc*"))
-Test.ignoreErrors.append(re.compile("ATTENTION.*value of option.*"))
-Test.ignoreErrors.append(re.compile("drmOpen.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Not testing OS support.*"))
-Test.ignoreErrors.append(re.compile("Mesa: User error:.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Initializing .* optimizations"))
-Test.ignoreErrors.append(re.compile("debug_get_.*"))
-Test.ignoreErrors.append(re.compile("util_cpu_caps.*"))
-Test.ignoreErrors.append(re.compile("Mesa: 3Dnow! detected"))
-Test.ignoreErrors.append(re.compile("r300:.*"))
-Test.ignoreErrors.append(re.compile("radeon:.*"))
-Test.ignoreErrors.append(re.compile("Warning:.*"))
-Test.ignoreErrors.append(re.compile("0 errors, .*"))
-Test.ignoreErrors.append(re.compile("Mesa.*"))
-Test.ignoreErrors.append(re.compile("no rrb"))
-Test.ignoreErrors.append(re.compile("; ModuleID.*"))
-Test.ignoreErrors.append(re.compile("%.*"))
-Test.ignoreErrors.append(re.compile(".*failed to translate tgsi opcode.*to SSE"))
-Test.ignoreErrors.append(re.compile(".*falling back to interpreter"))
-Test.ignoreErrors.append(re.compile("GLSL version is .*, but requested version .* is required"))
-Test.ignoreErrors.append(re.compile("kCGErrorIllegalArgument: CGSOrderWindowList"))
-Test.ignoreErrors.append(re.compile("kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint\(\) to catch errors as they are logged."))
-Test.ignoreErrors.append(re.compile("stw_(init|cleanup).*"))
-Test.ignoreErrors.append(re.compile("OpenGLInfo..*"))
-Test.ignoreErrors.append(re.compile("AdapterInfo..*"))
-Test.ignoreErrors.append(re.compile("No memory leaks detected."))
diff --git a/tests/all_egl.tests b/tests/all_egl.tests
index 669d334..c2d097a 100644
--- a/tests/all_egl.tests
+++ b/tests/all_egl.tests
@@ -1,4 +1,3 @@
-import re
import shlex
from framework.core import *
@@ -18,40 +17,3 @@ egl['egl-query-surface-EGL_BAD_ATTRIBUTE'] = plain_test('egl-query-surface --bad
egl['egl-query-surface-EGL_BAD_SURFACE'] = plain_test('egl-query-surface --bad-surface')
egl['egl-query-surface-EGL_HEIGHT'] = plain_test('egl-query-surface --attr=EGL_HEIGHT')
egl['egl-query-surface-EGL_WIDTH'] = plain_test('egl-query-surface --attr=EGL_WIDTH')
-
-# Ignore these Mesa diagnostic messages.
-Test.ignoreErrors.append(re.compile("couldn't open libtxc_dxtn.so"))
-Test.ignoreErrors.append(re.compile("compression/decompression available"))
-Test.ignoreErrors.append(re.compile("Mesa: .*build"))
-Test.ignoreErrors.append(re.compile("Mesa: CPU.*"))
-Test.ignoreErrors.append(re.compile("Mesa: .*cpu detected."))
-Test.ignoreErrors.append(re.compile("Mesa: Test.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Yes.*"))
-Test.ignoreErrors.append(re.compile("libGL: XF86DRIGetClientDriverName.*"))
-Test.ignoreErrors.append(re.compile("libGL: OpenDriver: trying.*"))
-Test.ignoreErrors.append(re.compile("libGL: Warning in.*drirc*"))
-Test.ignoreErrors.append(re.compile("ATTENTION.*value of option.*"))
-Test.ignoreErrors.append(re.compile("drmOpen.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Not testing OS support.*"))
-Test.ignoreErrors.append(re.compile("Mesa: User error:.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Initializing .* optimizations"))
-Test.ignoreErrors.append(re.compile("debug_get_.*"))
-Test.ignoreErrors.append(re.compile("util_cpu_caps.*"))
-Test.ignoreErrors.append(re.compile("Mesa: 3Dnow! detected"))
-Test.ignoreErrors.append(re.compile("r300:.*"))
-Test.ignoreErrors.append(re.compile("radeon:.*"))
-Test.ignoreErrors.append(re.compile("Warning:.*"))
-Test.ignoreErrors.append(re.compile("0 errors, .*"))
-Test.ignoreErrors.append(re.compile("Mesa.*"))
-Test.ignoreErrors.append(re.compile("no rrb"))
-Test.ignoreErrors.append(re.compile("; ModuleID.*"))
-Test.ignoreErrors.append(re.compile("%.*"))
-Test.ignoreErrors.append(re.compile(".*failed to translate tgsi opcode.*to SSE"))
-Test.ignoreErrors.append(re.compile(".*falling back to interpreter"))
-Test.ignoreErrors.append(re.compile("GLSL version is .*, but requested version .* is required"))
-Test.ignoreErrors.append(re.compile("kCGErrorIllegalArgument: CGSOrderWindowList"))
-Test.ignoreErrors.append(re.compile("kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint\(\) to catch errors as they are logged."))
-Test.ignoreErrors.append(re.compile("stw_(init|cleanup).*"))
-Test.ignoreErrors.append(re.compile("OpenGLInfo..*"))
-Test.ignoreErrors.append(re.compile("AdapterInfo..*"))
-Test.ignoreErrors.append(re.compile("No memory leaks detected."))
diff --git a/tests/all_es1.tests b/tests/all_es1.tests
index 9227818..eb478ed 100644
--- a/tests/all_es1.tests
+++ b/tests/all_es1.tests
@@ -2,8 +2,6 @@
# -*- coding: utf-8 -*-
# All GLESv1 tests that come with piglit, using default settings
-import re
-
from framework.core import *
from framework.exectest import *
@@ -32,41 +30,3 @@ oes_draw_texture['oes_draw_texture'] = PlainExecTest(['oes_draw_texture', '-auto
oes_draw_texture['oes_draw_texture'].runConcurrent = True
profile.tests['spec'] = spec
-
-#############
-# Some Mesa diagnostic messages that we should probably ignore
-Test.ignoreErrors.append(re.compile("couldn't open libtxc_dxtn.so"))
-Test.ignoreErrors.append(re.compile("compression/decompression available"))
-Test.ignoreErrors.append(re.compile("Mesa: .*build"))
-Test.ignoreErrors.append(re.compile("Mesa: CPU.*"))
-Test.ignoreErrors.append(re.compile("Mesa: .*cpu detected."))
-Test.ignoreErrors.append(re.compile("Mesa: Test.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Yes.*"))
-Test.ignoreErrors.append(re.compile("libGL: XF86DRIGetClientDriverName.*"))
-Test.ignoreErrors.append(re.compile("libGL: OpenDriver: trying.*"))
-Test.ignoreErrors.append(re.compile("libGL: Warning in.*drirc*"))
-Test.ignoreErrors.append(re.compile("ATTENTION.*value of option.*"))
-Test.ignoreErrors.append(re.compile("drmOpen.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Not testing OS support.*"))
-Test.ignoreErrors.append(re.compile("Mesa: User error:.*"))
-Test.ignoreErrors.append(re.compile("Mesa: Initializing .* optimizations"))
-Test.ignoreErrors.append(re.compile("debug_get_.*"))
-Test.ignoreErrors.append(re.compile("util_cpu_caps.*"))
-Test.ignoreErrors.append(re.compile("Mesa: 3Dnow! detected"))
-Test.ignoreErrors.append(re.compile("r300:.*"))
-Test.ignoreErrors.append(re.compile("radeon:.*"))
-Test.ignoreErrors.append(re.compile("Warning:.*"))
-Test.ignoreErrors.append(re.compile("0 errors, .*"))
-Test.ignoreErrors.append(re.compile("Mesa.*"))
-Test.ignoreErrors.append(re.compile("no rrb"))
-Test.ignoreErrors.append(re.compile("; ModuleID.*"))
-Test.ignoreErrors.append(re.compile("%.*"))
-Test.ignoreErrors.append(re.compile(".*failed to translate tgsi opcode.*to SSE"))
-Test.ignoreErrors.append(re.compile(".*falling back to interpreter"))
-Test.ignoreErrors.append(re.compile("GLSL version is .*, but requested version .* is required"))
-Test.ignoreErrors.append(re.compile("kCGErrorIllegalArgument: CGSOrderWindowList"))
-Test.ignoreErrors.append(re.compile("kCGErrorFailure: Set a breakpoint @ CGErrorBreakpoint\(\) to catch errors as they are logged."))
-Test.ignoreErrors.append(re.compile("stw_(init|cleanup).*"))
-Test.ignoreErrors.append(re.compile("OpenGLInfo..*"))
-Test.ignoreErrors.append(re.compile("AdapterInfo..*"))
-Test.ignoreErrors.append(re.compile("No memory leaks detected."))
--
1.7.7.6
More information about the Piglit
mailing list