From 91c6216aa7b98e35f5f30c703630e68a69b5251e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Sat, 24 Nov 2012 09:31:11 +0000 Subject: [PATCH] Drop pragmas. --- app_driver.py | 147 ++++++++---------- .../{default.ref.json => default.ref.0.json} | 0 apps/gl/default.ref.txt | 1 - ...ault_db.ref.json => default_db.ref.0.json} | 0 apps/gl/default_db.ref.txt | 1 - ...ault_sb.ref.json => default_sb.ref.0.json} | 0 apps/gl/default_sb.ref.txt | 1 - apps/gl/{tri.ref.json => tri.ref.flush.json} | 0 apps/gl/{tri.ref.png => tri.ref.flush.png} | Bin apps/gl/tri.ref.txt | 4 +- base_driver.py | 2 - tracematch.py | 27 +--- 12 files changed, 74 insertions(+), 109 deletions(-) rename apps/gl/{default.ref.json => default.ref.0.json} (100%) rename apps/gl/{default_db.ref.json => default_db.ref.0.json} (100%) rename apps/gl/{default_sb.ref.json => default_sb.ref.0.json} (100%) rename apps/gl/{tri.ref.json => tri.ref.flush.json} (100%) rename apps/gl/{tri.ref.png => tri.ref.flush.png} (100%) diff --git a/app_driver.py b/app_driver.py index e5536b8..3589fd0 100755 --- a/app_driver.py +++ b/app_driver.py @@ -46,42 +46,6 @@ import tracematch from base_driver import * -class RefTraceParser(tracematch.RefTraceParser): - - def __init__(self, fileName): - tracematch.RefTraceParser.__init__(self, open(fileName, 'rt')) - self.fileName = fileName - self.images = [] - self.states = [] - self.pragmaNo = 0 - - def handlePragma(self, line): - if self.calls: - lastCall = self.calls[-1] - if lastCall.callNo is None: - paramName = 'pragma%u' % self.pragmaNo - lastCall.callNo = tracematch.WildcardMatcher(paramName) - else: - paramName = lastCall.callNo.name - else: - paramName = 0 - self.pragmaNo += 1 - - pragma, rest = line.split(None, 1) - if pragma == '#image': - imageFileName = self.getAbsPath(rest) - self.images.append((paramName, imageFileName)) - elif pragma == '#state': - stateFileName = self.getAbsPath(rest) - self.states.append((paramName, stateFileName)) - else: - assert False - - def getAbsPath(self, path): - '''Get the absolute from a path relative to the reference filename''' - return os.path.abspath(os.path.join(os.path.dirname(self.fileName), path)) - - class SrcTraceParser(tracematch.SrcTraceParser): def __init__(self, stream): @@ -96,44 +60,6 @@ class SrcTraceParser(tracematch.SrcTraceParser): self.swapbuffers += 1 -class TraceChecker: - - def __init__(self, srcStream, refFileName): - self.srcStream = srcStream - self.refFileName = refFileName - self.doubleBuffer = False - self.callNo = 0 - self.images = [] - self.states = [] - - def check(self): - srcParser = SrcTraceParser(self.srcStream) - srcTrace = srcParser.parse() - self.doubleBuffer = srcParser.swapbuffers > 0 - - if self.refFileName: - refParser = RefTraceParser(self.refFileName) - refTrace = refParser.parse() - - try: - mo = refTrace.match(srcTrace) - except tracematch.TraceMismatch, ex: - self.fail(str(ex)) - - for paramName, imageFileName in refParser.images: - if isinstance(paramName, int): - callNo = paramName - else: - callNo = mo.params[paramName] - self.images.append((callNo, imageFileName)) - for paramName, stateFileName in refParser.states: - if isinstance(paramName, int): - callNo = paramName - else: - callNo = mo.params[paramName] - self.states.append((callNo, stateFileName)) - - class AppDriver(Driver): cmd = None @@ -162,11 +88,16 @@ class AppDriver(Driver): if not self.cmd: return + sys.stderr.write('Run application...\n') + p = popen(self.cmd, cwd=self.cwd) p.wait() if p.returncode != 0: skip('application returned code %i' % p.returncode) + sys.stdout.flush() + sys.stderr.write('\n') + api_trace_map = { 'gl': 'gl', 'egl_gl': 'egl', @@ -198,6 +129,8 @@ class AppDriver(Driver): if not self.cmd: return + sys.stderr.write('Capturing trace...\n') + if self.trace_file is None: if self.ref_dump is not None: name = self.ref_dump @@ -233,31 +166,74 @@ class AppDriver(Driver): if not os.path.exists(self.trace_file): fail('no trace file generated\n') + + sys.stdout.flush() + sys.stderr.write('\n') def checkTrace(self): + sys.stderr.write('Comparing trace %s against %s...\n' % (self.trace_file, self.ref_dump)) + cmd = [options.apitrace, 'dump', '--color=never', self.trace_file] p = popen(cmd, stdout=subprocess.PIPE) - checker = TraceChecker(p.stdout, self.ref_dump) - checker.check() + srcParser = SrcTraceParser(p.stdout) + srcTrace = srcParser.parse() + self.doubleBuffer = srcParser.swapbuffers > 0 + + images = [] + states = [] + + if self.ref_dump: + refParser = tracematch.RefTraceParser(self.ref_dump) + refTrace = refParser.parse() + + try: + mo = refTrace.match(srcTrace) + except tracematch.TraceMismatch, ex: + fail(str(ex)) + + dirName, baseName = os.path.split(os.path.abspath(self.ref_dump)) + prefix, _ = os.path.splitext(baseName) + prefix += '.' + fileNames = os.listdir(dirName) + for fileName in fileNames: + if fileName.startswith(prefix) and fileName != self.ref_dump: + rest = fileName[len(prefix):] + paramName, ext = os.path.splitext(rest) + if ext in ('.json', '.png'): + if paramName.isdigit(): + callNo = int(paramName) + else: + try: + callNo = mo.params[paramName] + except KeyError: + fail('could not find parameter %s for %s' % (paramName, fileName)) + filePath = os.path.join(dirName, fileName) + if ext == '.png': + images.append((callNo, filePath)) + if ext == '.json': + states.append((callNo, filePath)) p.wait() if p.returncode != 0: fail('`apitrace dump` returned code %i' % p.returncode) - self.doubleBuffer = checker.doubleBuffer + sys.stdout.flush() + sys.stderr.write('\n') if self.api not in self.api_retrace_map: return - for callNo, refImageFileName in checker.images: + for callNo, refImageFileName in images: self.checkImage(callNo, refImageFileName) - for callNo, refStateFileName in checker.states: + for callNo, refStateFileName in states: self.checkState(callNo, refStateFileName) def checkImage(self, callNo, refImageFileName): + sys.stderr.write('Comparing snapshot from call %u against %s...\n' % (callNo, refImageFileName)) try: from PIL import Image except ImportError: + sys.stderr.write('warning: PIL not found, skipping image comparison\n'); return srcImage = self.getImage(callNo) @@ -275,7 +251,12 @@ class AppDriver(Driver): comparer.write_diff(diffImageFileName) fail('snapshot from call %u does not match %s' % (callNo, refImageFileName)) + sys.stdout.flush() + sys.stderr.write('\n') + def checkState(self, callNo, refStateFileName): + sys.stderr.write('Comparing state dump from call %u against %s...\n' % (callNo, refStateFileName)) + srcState = self.getState(callNo) refState = self.getRefState(refStateFileName) @@ -293,6 +274,9 @@ class AppDriver(Driver): differ.visit(refState, srcState) fail('state from call %u does not match %s' % (callNo, refStateFileName)) + sys.stdout.flush() + sys.stderr.write('\n') + def getRefState(self, refStateFileName): stream = open(refStateFileName, 'rt') from jsondiff import load @@ -318,11 +302,16 @@ class AppDriver(Driver): if self.api not in self.api_retrace_map: return + sys.stderr.write('Retracing %s...\n' % (self.trace_file,)) + p = self._retrace() p.wait() if p.returncode != 0: fail('retrace failed with code %i' % (p.returncode)) + sys.stdout.flush() + sys.stderr.write('\n') + def getImage(self, callNo): from PIL import Image state = self.getState(callNo) diff --git a/apps/gl/default.ref.json b/apps/gl/default.ref.0.json similarity index 100% rename from apps/gl/default.ref.json rename to apps/gl/default.ref.0.json diff --git a/apps/gl/default.ref.txt b/apps/gl/default.ref.txt index cb3cedf..e69de29 100644 --- a/apps/gl/default.ref.txt +++ b/apps/gl/default.ref.txt @@ -1 +0,0 @@ -#state default.ref.json diff --git a/apps/gl/default_db.ref.json b/apps/gl/default_db.ref.0.json similarity index 100% rename from apps/gl/default_db.ref.json rename to apps/gl/default_db.ref.0.json diff --git a/apps/gl/default_db.ref.txt b/apps/gl/default_db.ref.txt index 17281f8..e69de29 100644 --- a/apps/gl/default_db.ref.txt +++ b/apps/gl/default_db.ref.txt @@ -1 +0,0 @@ -#state default_db.ref.json diff --git a/apps/gl/default_sb.ref.json b/apps/gl/default_sb.ref.0.json similarity index 100% rename from apps/gl/default_sb.ref.json rename to apps/gl/default_sb.ref.0.json diff --git a/apps/gl/default_sb.ref.txt b/apps/gl/default_sb.ref.txt index 48c6224..e69de29 100644 --- a/apps/gl/default_sb.ref.txt +++ b/apps/gl/default_sb.ref.txt @@ -1 +0,0 @@ -#state default_sb.ref.json diff --git a/apps/gl/tri.ref.json b/apps/gl/tri.ref.flush.json similarity index 100% rename from apps/gl/tri.ref.json rename to apps/gl/tri.ref.flush.json diff --git a/apps/gl/tri.ref.png b/apps/gl/tri.ref.flush.png similarity index 100% rename from apps/gl/tri.ref.png rename to apps/gl/tri.ref.flush.png diff --git a/apps/gl/tri.ref.txt b/apps/gl/tri.ref.txt index 90dd8aa..1288d92 100644 --- a/apps/gl/tri.ref.txt +++ b/apps/gl/tri.ref.txt @@ -13,6 +13,4 @@ glVertex3f(x = 0.9, y = -0.9, z = -30) glColor3f(red = 0, green = 0, blue = 0.7) glVertex3f(x = 0, y = 0.9, z = -30) glEnd() -glFlush() -#image tri.ref.png -#state tri.ref.json + glFlush() diff --git a/base_driver.py b/base_driver.py index 1971fce..d71cab1 100644 --- a/base_driver.py +++ b/base_driver.py @@ -169,8 +169,6 @@ class Driver: if not args: optparser.error('an argument must be specified') - print get_scripts_path() - sys.path.insert(0, get_scripts_path()) self.options = options diff --git a/tracematch.py b/tracematch.py index 68949b1..41320c1 100755 --- a/tracematch.py +++ b/tracematch.py @@ -430,7 +430,7 @@ class Parser: ####################################################################### -ID, NUMBER, HEXNUM, STRING, WILDCARD, PRAGMA, LPAREN, RPAREN, LCURLY, RCURLY, COMMA, AMP, EQUAL, PLUS, VERT, BLOB = xrange(16) +ID, NUMBER, HEXNUM, STRING, WILDCARD, LPAREN, RPAREN, LCURLY, RCURLY, COMMA, AMP, EQUAL, PLUS, VERT, BLOB = xrange(15) class CallScanner(Scanner): @@ -454,9 +454,6 @@ class CallScanner(Scanner): # Wildcard (WILDCARD, r'<[^>]*>', False), - - # Pragma - (PRAGMA, r'#[^\r\n]*', False), ] # symbol table @@ -510,15 +507,8 @@ class TraceParser(Parser): def parse(self): while not self.eof(): - self.parse_element() - return TraceMatcher(self.calls) - - def parse_element(self): - if self.lookahead.type == PRAGMA: - token = self.consume() - self.handlePragma(token.text) - else: self.parse_call() + return TraceMatcher(self.calls) def parse_call(self): if self.lookahead.type == NUMBER: @@ -686,14 +676,11 @@ class TraceParser(Parser): def handleCall(self, callNo, functionName, args, ret): raise NotImplementedError - def handlePragma(self, line): - raise NotImplementedError - class RefTraceParser(TraceParser): - def __init__(self, stream): - TraceParser.__init__(self, stream) + def __init__(self, fileName): + TraceParser.__init__(self, open(fileName, 'rt')) self.calls = [] def parse(self): @@ -730,9 +717,6 @@ class RefTraceParser(TraceParser): def handleCall(self, callNo, functionName, args, ret): call = CallMatcher(callNo, functionName, args, ret) self.calls.append(call) - - def handlePragma(self, line): - pass class SrcTraceParser(TraceParser): @@ -792,8 +776,7 @@ def main(): refFileName, srcFileName = args - refStream = open(refFileName, 'rt') - refParser = RefTraceParser(refStream) + refParser = RefTraceParser(refFileName) refTrace = refParser.parse() if options.verbose: sys.stdout.write('// Reference\n') -- 2.43.0