3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2025-08-01 21:05:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor some common code, use __LINE__ instead of __COUNTER__ where possible

Browse Source
This commit is contained in:
Malcolm Noyes
2013-12-19 16:25:50 +00:00
parent a9e0efdcad
commit cbd3113e6b
4 changed files with 92 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/catch_conditions.py
View File

@@ -134,7 +134,14 @@ class TestConditionData:
if not(reasonOnSameLine) and len(self.reason):
lines.append(self.reason)
if len(self.condition):
lines.append(" " + self.condition)
line = self.condition
m = self.hexParser.match(line)
if m:
while m:
line = m.group(1) + "0x<hex digits>" + m.group(3)
m = self.hexParser.match(line)
line = line.replace("__null","0")
lines.append(" " + line)
if len(self.expansionPrefix):
lines.append(self.expansionPrefix)
extraLine = True
@@ -145,6 +152,7 @@ class TestConditionData:
while m:
line = m.group(1) + "0x<hex digits>" + m.group(3)
m = self.hexParser.match(line)
line = line.replace("__null","0")
lines.append(" " + line)
if len(self.messagePrefix):
lines.append(self.messagePrefix)
@@ -223,7 +231,14 @@ class TestConditionData:
if not(reasonOnSameLine) and len(self.reason):
lines.append(self.reason)
if len(self.condition):
lines.append(" " + self.condition)
line = self.condition
m = self.hexParser.match(line)
if m:
while m:
line = m.group(1) + "0x<hex digits>" + m.group(3)
m = self.hexParser.match(line)
line = line.replace("Catch::Text","Text")
lines.append(" " + line)
if len(self.expansionPrefix):
lines.append(self.expansionPrefix)
extraLine = True

9
scripts/validateVSTests.py
View File

@@ -44,8 +44,8 @@ def approve( baseName, args ):
rawResultsPath = os.path.join( rootPath, '_{0}.tmp'.format( baseName ) )
if os.path.exists( baselinesPath ):
approvedFileHandler = TestRunApprovedHandler(baselinesPath)
baselinesPathNew = os.path.join( rootPath, '{0}.approved.new.txt'.format( baseName ) )
approvedFileHandler.writeRawFile(baselinesPathNew)
#baselinesPathNew = os.path.join( rootPath, '{0}.approved.new.txt'.format( baseName ) )
#approvedFileHandler.writeRawFile(baselinesPathNew)
approvedFileHandler.writeSortedRawFile(baselinesSortedPath)
else:
raise Exception("Base file does not exist: '" + baselinesPath + "'")
@@ -59,11 +59,12 @@ def approve( baseName, args ):
if os.path.exists( rawResultsPath ):
resultFileHandler = TestRunResultHandler(rawResultsPath)
rawPathNew = os.path.join( rootPath, '{0}.rewrite.txt'.format( baseName ) )
#rawPathNew = os.path.join( rootPath, '{0}.rewrite.txt'.format( baseName ) )
#print "F:",rawPathNew,",",approvedFileHandler.current.outputLine
resultFileHandler.writeRawFile(rawPathNew)
#resultFileHandler.writeRawFile(rawPathNew)
rawPathNewSorted = os.path.join( rootPath, '{0}.sorted.unapproved.txt'.format( baseName ) )
resultFileHandler.writeSortedUnapprovedFile(rawPathNewSorted, approvedFileHandler.current.outputLine)
os.remove( rawResultsPath )
else:
raise Exception("Results file does not exist: '" + rawResultsPath + "'")