Removed line numbers from approval tests of xml too

This commit is contained in:
Phil Nash 2013-06-29 12:04:38 +01:00
parent 40b8c7794c
commit a9b346b14d
2 changed files with 616 additions and 611 deletions

File diff suppressed because it is too large Load Diff

View File

@ -6,6 +6,7 @@ import re
from scriptCommon import catchPath from scriptCommon import catchPath
filenameParser = re.compile( r'\s*.*/(.*\..pp):([0-9]*)(.*)' ) filenameParser = re.compile( r'\s*.*/(.*\..pp):([0-9]*)(.*)' )
lineNumberParser = re.compile( r'(.*)line="[0-9]*"(.*)' )
hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' ) hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
#catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0]))) #catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
@ -35,6 +36,10 @@ for line in rawFile:
m = filenameParser.match( line ) m = filenameParser.match( line )
if m: if m:
line = m.group(1) + m.group(3) line = m.group(1) + m.group(3)
else:
m = lineNumberParser.match( line )
if m:
line = m.group(1) + m.group(2)
while True: while True:
m = hexParser.match( line ) m = hexParser.match( line )