3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored scripts to start using a common file

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
scripts/approvalTests.py
View File

@ -3,18 +3,21 @@ import sys
import subprocess import subprocess
import re import re
from scriptCommon import catchPath
filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' ) filenameParser = re.compile( r'\s*.*/(.*\..pp)(.*)' )
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.realpath(os.path.dirname(sys.argv[0])) #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' ) baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedResults.txt' )
filteredResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/unapprovedResults.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: if len(sys.argv) == 2:
cmdPath = sys.argv[1] cmdPath = sys.argv[1]
else: 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' ) f = open( rawResultsPath, 'w' )
subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console" ], stdout=f, stderr=f ) subprocess.call([ cmdPath, "~dummy", "-s", "-w", "NoAssertions", "-r", "console" ], stdout=f, stderr=f )

7
scripts/approve.py
View File

@ -2,9 +2,10 @@ import os
import sys import sys
import shutil import shutil
catchPath = os.path.realpath(os.path.dirname(sys.argv[0])) from scriptCommon import catchPath
baselinesPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/approvedResults.txt' )
filteredResultsPath = os.path.join( catchPath, '../projects/SelfTest/Baselines/unapprovedResults.txt' ) baselinesPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/approvedResults.txt' )
filteredResultsPath = os.path.join( catchPath, 'projects/SelfTest/Baselines/unapprovedResults.txt' )
if os.path.isfile( filteredResultsPath ): if os.path.isfile( filteredResultsPath ):
os.remove( baselinesPath ) os.remove( baselinesPath )

7
scripts/generateSingleHeader.py
View File

@ -3,6 +3,8 @@ import sys
import re import re
import datetime import datetime
from scriptCommon import catchPath
versionParser = re.compile( r'(\s*Version\slibraryVersion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*\).*' ) versionParser = re.compile( r'(\s*Version\slibraryVersion)\s*\(\s*(.*)\s*,\s*(.*)\s*,\s*(.*)\s*,\s*\"(.*)\"\s*\).*' )
includesParser = re.compile( r'\s*#include\s*"(.*)"' ) includesParser = re.compile( r'\s*#include\s*"(.*)"' )
guardParser = re.compile( r'\s*#.*_INCLUDED') guardParser = re.compile( r'\s*#.*_INCLUDED')
@ -11,10 +13,9 @@ commentParser1 = re.compile( r'^\s*/\*')
commentParser2 = re.compile( r'^\s*\*') commentParser2 = re.compile( r'^\s*\*')
blankParser = re.compile( r'^\s*$') blankParser = re.compile( r'^\s*$')
seenHeaders = set([]) seenHeaders = set([])
catchPath = os.path.realpath(os.path.dirname(sys.argv[0])) rootPath = os.path.join( catchPath, 'include/' )
rootPath = os.path.join( catchPath, '../include/' )
versionPath = os.path.join( rootPath, "internal/catch_version.hpp" ) versionPath = os.path.join( rootPath, "internal/catch_version.hpp" )
readmePath = os.path.join( catchPath, "../README.md" ) readmePath = os.path.join( catchPath, "README.md" )
#outputPath = os.path.join( catchPath, 'single_include/catch.hpp' ) #outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
bumpVersion = len(sys.argv) < 2 or sys.argv[1] <> "nobump" bumpVersion = len(sys.argv) < 2 or sys.argv[1] <> "nobump"

4
scripts/scriptCommon.py Normal file
View File

@ -0,0 +1,4 @@
import os
import sys
catchPath = os.path.dirname(os.path.realpath( os.path.dirname(sys.argv[0])))