Refactored scripts to start using a common file

This commit is contained in:
Phil Nash
2013-04-24 18:58:57 +01:00
parent 1309da2b55
commit 2278451cd2
4 changed files with 20 additions and 11 deletions

View File

@@ -3,18 +3,21 @@ import sys
import subprocess
import re
from scriptCommon import catchPath
filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' )
hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
catchPath = os.path.realpath(os.path.dirname(sys.argv[0]))
baselinesPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/approvedResults.txt' )
rawResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/_rawResults.tmp' )
filteredResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/unapprovedResults.txt' )
#catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))
baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedResults.txt' )
rawResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/_rawResults.tmp' )
filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/unapprovedResults.txt' )
if len(sys.argv) == 2:
cmdPath = sys.argv[1]
else:
cmdPath = "../projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest"
cmdPath = os.path.join( catchPath, 'projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest' )
f = open( rawResultsPath, 'w' )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console" ], stdout=f, stderr=f )