diff options
| author | Phil Nash | 2013-09-30 08:01:10 +0100 |
|---|---|---|
| committer | Phil Nash | 2013-09-30 08:01:10 +0100 |
| commit | 16c21ee2656d6e48fcddfe3f59ba5df8e9064fdc (patch) | |
| tree | 13e34cdccf64300ba491a3cb44a16399b1749d73 /scripts | |
| parent | 1e74938538544afde5e08c0ec667ad7e6ddad9a9 (diff) | |
| download | catch3-16c21ee2656d6e48fcddfe3f59ba5df8e9064fdc.tar.gz | |
No, really trim paths in approval tests down to just filenames
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/approvalTests.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py index ad28cf95..4d072378 100644 --- a/scripts/approvalTests.py +++ b/scripts/approvalTests.py @@ -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: |