Updated approval tests baselines
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 83d2a15..af806f0 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -774,5 +774,5 @@
"first" == "second"
===============================================================================
-125 test cases - 38 failed (660 assertions - 93 failed)
+125 test cases - 38 failed (661 assertions - 93 failed)
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 2160b17..bf8892f 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -3656,8 +3656,8 @@
MiscTests.cpp:<line number>
...............................................................................
-
-No assertions in test case 'not allowed'
+MiscTests.cpp:<line number>:
+PASSED:
-------------------------------------------------------------------------------
Process can be configured on command line
@@ -6991,5 +6991,5 @@
true
===============================================================================
-125 test cases - 54 failed (680 assertions - 113 failed)
+125 test cases - 53 failed (680 assertions - 112 failed)
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 071b783..5f848ab 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,5 +1,5 @@
<testsuites>
- <testsuite name="~_" errors="12" failures="101" tests="680" hostname="tbd" time="{duration}" timestamp="tbd">
+ <testsuite name="~_" errors="12" failures="100" tests="680" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
<testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>
@@ -443,6 +443,7 @@
</failure>
</testcase>
<testcase classname="A couple of nested sections followed by a failure" name="Outer/Inner" time="{duration}"/>
+ <testcase classname="global" name="not allowed" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="default - no arguments" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="test lists/1 test" time="{duration}"/>
<testcase classname="Process can be configured on command line" name="test lists/Specify one test case exclusion using exclude:" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 4f8835b..24560b6 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -7245,7 +7245,7 @@
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="567" failures="113"/>
+ <OverallResults successes="568" failures="112"/>
</Group>
- <OverallResults successes="567" failures="113"/>
+ <OverallResults successes="568" failures="112"/>
</Catch>
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index f39553d..dc45ed0 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -17,7 +17,7 @@
if len(sys.argv) == 2:
cmdPath = sys.argv[1]
else:
- cmdPath = os.path.join( catchPath, 'projects/XCode4/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest' )
+ cmdPath = os.path.join( catchPath, 'projects/XCode/CatchSelfTest/DerivedData/CatchSelfTest/Build/Products/Debug/CatchSelfTest' )
overallResult = 0