Updated approvalTests script to allow for modified version strings
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index 92e2876..618812f 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -15,7 +15,8 @@
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]*"(.*)' )
-versionParser = re.compile( r'(.*?)Catch v[0-9]*\.[0-9]*\.[0-9].?( .*)' )
+versionParser = re.compile( r'(.*?)Catch v[0-9]*\.[0-9]*\.[0-9]*(.*)' )
+devVersionParser = re.compile( r'(.*?)Catch v[0-9]*\.[0-9]*\.[0-9]*-develop\.[0-9]*(.*)' )
if len(sys.argv) == 2:
cmdPath = sys.argv[1]
@@ -41,9 +42,13 @@
if path.startswith( catchPath ):
path = path[1+len(catchPath):]
line = m.group(1) + path + m.group(3)
- m = versionParser.match( line )
+ m = devVersionParser.match( line )
if m:
line = m.group(1) + "<version>" + m.group(2)
+ else:
+ m = versionParser.match( line )
+ if m:
+ line = m.group(1) + "<version>" + m.group(2)
while True:
m = hexParser.match( line )