comparison mx/outputparser.py @ 4219:47f7d91d34cf

Fix javac build issues with classpath WIP for benchmarks
author Gilles Duboscq <gilles.m.duboscq@gmail.com>
date Wed, 04 Jan 2012 22:54:27 +0100
parents a2caa019ba3a
children 339cf8d4904d
comparison
equal deleted inserted replaced
4218:03eaec130ed1 4219:47f7d91d34cf
8 self.nonZeroIsFatal = nonZeroIsFatal 8 self.nonZeroIsFatal = nonZeroIsFatal
9 9
10 def addMatcher(self, matcher): 10 def addMatcher(self, matcher):
11 self.matchers.append(matcher) 11 self.matchers.append(matcher)
12 12
13 def parse(self, vm, cmd, cwd=None): 13 def parse(self, vm, cmd, cwd=None, vmbuild=None):
14 ret = [{}] 14 ret = [{}]
15 15
16 def parseLine(line): 16 def parseLine(line):
17 anyMatch = False 17 anyMatch = False
18 for matcher in self.matchers: 18 for matcher in self.matchers:
25 if anyMatch : 25 if anyMatch :
26 mx.log('>' + line.rstrip()) 26 mx.log('>' + line.rstrip())
27 else : 27 else :
28 mx.log( line.rstrip()) 28 mx.log( line.rstrip())
29 29
30 retcode = commands.vm(cmd, nonZeroIsFatal=self.nonZeroIsFatal, out=parseLine, err=parseLine, cwd=cwd) 30 retcode = commands.vm(cmd, vm, nonZeroIsFatal=self.nonZeroIsFatal, out=parseLine, err=parseLine, cwd=cwd, vmbuild=vmbuild)
31 return {'parsed' : ret, 'retcode' : retcode} 31 return {'parsed' : ret, 'retcode' : retcode}
32 32
33 class Matcher: 33 class Matcher:
34 34
35 def __init__(self, regex, valuesToParse, startNewLine=False): 35 def __init__(self, regex, valuesToParse, startNewLine=False):