From d9858b16096ac4ec7c99f1430a6ee934e33db2e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 23 Nov 2012 22:15:01 +0000 Subject: [PATCH 1/1] Rename checker.py -> tracematch.py --- app_driver.py | 18 ++++++++---------- checker.py => tracematch.py | 0 2 files changed, 8 insertions(+), 10 deletions(-) rename checker.py => tracematch.py (100%) diff --git a/app_driver.py b/app_driver.py index 2e05a57..e5536b8 100755 --- a/app_driver.py +++ b/app_driver.py @@ -42,16 +42,14 @@ except ImportError: from StringIO import StringIO +import tracematch from base_driver import * -import checker - - -class RefTraceParser(checker.RefTraceParser): +class RefTraceParser(tracematch.RefTraceParser): def __init__(self, fileName): - checker.RefTraceParser.__init__(self, open(fileName, 'rt')) + tracematch.RefTraceParser.__init__(self, open(fileName, 'rt')) self.fileName = fileName self.images = [] self.states = [] @@ -62,7 +60,7 @@ class RefTraceParser(checker.RefTraceParser): lastCall = self.calls[-1] if lastCall.callNo is None: paramName = 'pragma%u' % self.pragmaNo - lastCall.callNo = checker.WildcardMatcher(paramName) + lastCall.callNo = tracematch.WildcardMatcher(paramName) else: paramName = lastCall.callNo.name else: @@ -84,14 +82,14 @@ class RefTraceParser(checker.RefTraceParser): return os.path.abspath(os.path.join(os.path.dirname(self.fileName), path)) -class SrcTraceParser(checker.SrcTraceParser): +class SrcTraceParser(tracematch.SrcTraceParser): def __init__(self, stream): - checker.SrcTraceParser.__init__(self, stream) + tracematch.SrcTraceParser.__init__(self, stream) self.swapbuffers = 0 def handleCall(self, callNo, functionName, args, ret): - checker.SrcTraceParser.handleCall(self, callNo, functionName, args, ret) + tracematch.SrcTraceParser.handleCall(self, callNo, functionName, args, ret) if functionName.find('SwapBuffers') != -1 or \ repr(args).find('kCGLPFADoubleBuffer') != -1: @@ -119,7 +117,7 @@ class TraceChecker: try: mo = refTrace.match(srcTrace) - except checker.TraceMismatch, ex: + except tracematch.TraceMismatch, ex: self.fail(str(ex)) for paramName, imageFileName in refParser.images: diff --git a/checker.py b/tracematch.py similarity index 100% rename from checker.py rename to tracematch.py -- 2.43.0