Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Moved scripts into their own folder

Commit
f4254b8622ebeb39dd9d7251ef375328fae30576
Author
Phil Nash ·
Parents
f155366cf268

Files · Download .tar.gz

Changes

 approvalTests.py => scripts/approvalTests.py               | 8 ++++----
 approve.py => scripts/approve.py                           | 4 ++--
 generateSingleHeader.py => scripts/generateSingleHeader.py | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/approvalTests.py b/scripts/approvalTests.py
similarity index 80%
rename from approvalTests.py
rename to scripts/approvalTests.py
index c6ede479..1bf114af 100644
--- a/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -7,14 +7,14 @@ 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' )
+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 = "../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 )
diff --git a/approve.py b/scripts/approve.py
similarity index 58%
rename from approve.py
rename to scripts/approve.py
index 83b25594..25a566b4 100644
--- a/approve.py
+++ b/scripts/approve.py
@@ -3,8 +3,8 @@ import sys
 import shutil
 
 catchPath = os.path.realpath(os.path.dirname(sys.argv[0]))
-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 ):
 	os.remove( baselinesPath )
diff --git a/generateSingleHeader.py b/scripts/generateSingleHeader.py
similarity index 97%
rename from generateSingleHeader.py
rename to scripts/generateSingleHeader.py
index ac122d6e..85b24ec6 100644
--- a/generateSingleHeader.py
+++ b/scripts/generateSingleHeader.py
@@ -12,9 +12,9 @@ commentParser2 = re.compile( r'^\s*\*')
 blankParser = re.compile( r'^\s*$')
 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" )
-readmePath = os.path.join( catchPath, "README.md" )
+readmePath = os.path.join( catchPath, "../README.md" )
 #outputPath = os.path.join( catchPath, 'single_include/catch.hpp' )
 
 bumpVersion = len(sys.argv) < 2 or sys.argv[1] <> "nobump"