No, really trim paths in approval tests down to just filenames

This commit is contained in:
Phil Nash 2013-09-30 08:01:10 +01:00
parent 1e74938538
commit 16c21ee265
6 changed files with 1346 additions and 1321 deletions

View file

@ -7,7 +7,8 @@ from scriptCommon import catchPath
rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
filenameParser = re.compile( r'.*?/(.*\..pp):([0-9]*)(.*)' )
filenameParser = re.compile( r'.*/(.*\..pp:)(.*)' )
filelineParser = re.compile( r'(.*\..pp:)([0-9]*)(.*)' )
lineNumberParser = re.compile( r'(.*)line="[0-9]*"(.*)' )
hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
durationsParser = re.compile( r'(.*)time="[0-9]*\.[0-9]*"(.*)' )
@ -22,7 +23,10 @@ overallResult = 0
def filterLine( line ):
m = filenameParser.match( line )
if m:
line = m.group(1) + m.group(3)
line = m.group(1) + m.group(2)
m = filelineParser.match( line )
if m:
line = m.group(1) + "<line number>" + m.group(3)
else:
m = lineNumberParser.match( line )
if m: