No, really trim paths in approval tests down to just filenames
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 3d3df67..e0c6f54 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -6,10 +6,10 @@
 -------------------------------------------------------------------------------
 ./failing/TestClass/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -17,10 +17,10 @@
 -------------------------------------------------------------------------------
 ./failing/Fixture/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -28,70 +28,70 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/equality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1 == Approx( 9.11 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1 == Approx( 9 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1 == Approx( 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1 == Approx( 0 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -99,30 +99,30 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/inequality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1 != Approx( 9.1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.14159 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -130,100 +130,100 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/ordered
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1 < 9
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1 > 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1 > 9.2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -231,39 +231,39 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/not
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( false != false )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( 1 == 1 )
 with expansion:
   !(1 == 1)
@@ -271,19 +271,19 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/explicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisThrows() )
 due to unexpected exception with message:
   expected exception
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow() )
 because no exception was thrown where one was expected:
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -291,20 +291,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -313,20 +313,20 @@
 ./failing/exceptions/implicit/3
   section name
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/4
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -334,20 +334,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/nothrow
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -355,10 +355,10 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/throw
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_AS( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -366,20 +366,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/double
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
 ./failing/message/info/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -390,10 +390,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/info/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
@@ -401,7 +401,7 @@
   this message may be logged later
   this message should be logged
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
@@ -411,10 +411,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/fail
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
@@ -422,10 +422,10 @@
 ./failing/message/sections
   one
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section one
 
@@ -433,10 +433,10 @@
 ./failing/message/sections
   two
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section two
 
@@ -445,10 +445,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/scoped
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -459,10 +459,10 @@
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Previous info should not be seen
 
@@ -471,10 +471,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -483,10 +483,10 @@
 ./mixed/Misc/Sections/loops
   s1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -494,45 +494,45 @@
 -------------------------------------------------------------------------------
 ./mixed/Misc/loops
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -544,10 +544,10 @@
 -------------------------------------------------------------------------------
 ./failing/info
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -556,15 +556,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedif
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -572,15 +572,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedelse
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -588,10 +588,10 @@
 -------------------------------------------------------------------------------
 ./manual/onechar
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -599,10 +599,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Contains
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
@@ -610,10 +610,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/StartsWith
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
@@ -621,10 +621,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/EndsWith
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
@@ -632,10 +632,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Equals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
@@ -643,30 +643,30 @@
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
@@ -683,15 +683,15 @@
 -------------------------------------------------------------------------------
 ./failing/Tricky/non streamable type
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -699,10 +699,10 @@
 -------------------------------------------------------------------------------
 ./failing/string literals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index cb20c83..7540bd0 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -6,40 +6,40 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/simple
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
 with expansion:
@@ -48,16 +48,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/epsilon
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.231 ) )
 with expansion:
   1.23 != Approx( 1.231 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
 with expansion:
@@ -66,16 +66,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/float
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.23f == Approx( 1.23f ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
 with expansion:
@@ -84,48 +84,48 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/int
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
 ./succeeding/Approx/mixed
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.0f == Approx( 1 ) )
 with expansion:
   1 == Approx( 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
   0 == Approx( 1e-05 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234 == Approx( 1.234 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
 with expansion:
@@ -134,52 +134,52 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/custom
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
 with expansion:
@@ -188,16 +188,16 @@
 -------------------------------------------------------------------------------
 Approximate PI
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
 with expansion:
   3.1428571429 == Approx( 3.141 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
 with expansion:
@@ -206,10 +206,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/TestClass/succeedingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
+ClassTests.cpp:<line number>:
 PASSED:
   REQUIRE( s == "hello" )
 with expansion:
@@ -218,10 +218,10 @@
 -------------------------------------------------------------------------------
 ./failing/TestClass/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -229,10 +229,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/Fixture/succeedingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
+ClassTests.cpp:<line number>:
 PASSED:
   REQUIRE( m_a == 1 )
 with expansion:
@@ -241,10 +241,10 @@
 -------------------------------------------------------------------------------
 ./failing/Fixture/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -252,46 +252,46 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/equality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven == 7 )
 with expansion:
   7 == 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1 == Approx( 9.1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.14159 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
 with expansion:
@@ -300,70 +300,70 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/equality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1 == Approx( 9.11 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1 == Approx( 9 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1 == Approx( 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1 == Approx( 0 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
@@ -371,70 +371,70 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/inequality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven != 6 )
 with expansion:
   7 != 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven != 8 )
 with expansion:
   7 != 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
 with expansion:
   9.1 != Approx( 9.11 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
 with expansion:
   9.1 != Approx( 9 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 1 ) )
 with expansion:
   9.1 != Approx( 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one != Approx( 0 ) )
 with expansion:
   9.1 != Approx( 0 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.double_pi != Approx( 3.1415 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "goodbye" )
 with expansion:
   "hello" != "goodbye"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "hell" )
 with expansion:
   "hello" != "hell"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello != "hello1" )
 with expansion:
   "hello" != "hello1"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello.size() != 6 )
 with expansion:
@@ -443,30 +443,30 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/inequality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1 != Approx( 9.1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.14159 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
@@ -474,106 +474,106 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/ordered
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven < 8 )
 with expansion:
   7 < 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > 6 )
 with expansion:
   7 > 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > 0 )
 with expansion:
   7 > 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven > -1 )
 with expansion:
   7 > -1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven >= 7 )
 with expansion:
   7 >= 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven >= 6 )
 with expansion:
   7 >= 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven <= 7 )
 with expansion:
   7 <= 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven <= 8 )
 with expansion:
   7 <= 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one > 9 )
 with expansion:
   9.1 > 9
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one < 10 )
 with expansion:
   9.1 < 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one < 9.2 )
 with expansion:
   9.1 < 9.2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello <= "hello" )
 with expansion:
   "hello" <= "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello >= "hello" )
 with expansion:
   "hello" >= "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello < "hellp" )
 with expansion:
   "hello" < "hellp"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello < "zebra" )
 with expansion:
   "hello" < "zebra"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello > "hellm" )
 with expansion:
   "hello" > "hellm"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello > "a" )
 with expansion:
@@ -582,100 +582,100 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/ordered
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 7 )
 with expansion:
   7 < 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 6 )
 with expansion:
   7 < 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < 0 )
 with expansion:
   7 < 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven < -1 )
 with expansion:
   7 < -1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven <= 6 )
 with expansion:
   7 <= 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one < 9 )
 with expansion:
   9.1 < 9
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1 > 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1 > 9.2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hello" )
 with expansion:
   "hello" < "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "hellm" )
 with expansion:
   "hello" < "hellm"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello < "a" )
 with expansion:
   "hello" < "a"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello >= "z" )
 with expansion:
   "hello" >= "z"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.str_hello <= "a" )
 with expansion:
   "hello" <= "a"
@@ -683,82 +683,82 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/int literals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( i == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( ui == 2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( l == 3 )
 with expansion:
   3 == 3
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( ul == 4 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( c == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( uc == 6 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1 == i )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 2 == ui )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 3 == l )
 with expansion:
   3 == 3
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 4 == ul )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 5 == c )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( 6 == uc )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( (std::numeric_limits<unsigned long>::max)() > ul )
 with expansion:
@@ -767,28 +767,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions//long_to_unsigned_x
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_char_var )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_short_var )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_int_var )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( long_var == unsigned_long_var )
 with expansion:
@@ -797,28 +797,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/const ints to int literal
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_char_var == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_short_var == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_int_var == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( unsigned_long_var == 1 )
 with expansion:
@@ -827,40 +827,40 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/negative ints
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( ( -1 > 2u ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( -1 > 2u )
 with expansion:
   -1 > 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( ( 2u < -1 ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( 2u < -1 )
 with expansion:
   2 < -1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( ( minInt > 2u ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( minInt > 2u )
 with expansion:
@@ -869,10 +869,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/computed ints
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   CHECK( 54 == 6*9 )
 with expansion:
@@ -881,52 +881,52 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/ptr
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( p == __null )
 with expansion:
   __null == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( p == pNULL )
 with expansion:
   __null == __null
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( p != __null )
 with expansion:
   0x<hex digits> != 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( cp != __null )
 with expansion:
   0x<hex digits> != 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( cpc != __null )
 with expansion:
   0x<hex digits> != 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( returnsNull() == __null )
 with expansion:
   {null string} == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( returnsConstNull() == __null )
 with expansion:
   {null string} == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( __null != p )
 with expansion:
@@ -935,46 +935,46 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/not
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( false == false )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( true == true )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( !false )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( false )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( !falseValue )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( falseValue )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( !(1 == 2) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( 1 == 2 )
 with expansion:
@@ -983,39 +983,39 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/not
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( false != false )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( true != true )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !true )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( true )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !trueValue )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK_FALSE( 1 == 1 )
 with expansion:
   !(1 == 1)
@@ -1023,37 +1023,37 @@
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/explicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp:
+ExceptionTests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS_AS( thisThrows() )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp:
+ExceptionTests.cpp:<line number>:
 PASSED:
   REQUIRE_NOTHROW( thisDoesntThrow() )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp:
+ExceptionTests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisThrows() )
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/explicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisThrows() )
 due to unexpected exception with message:
   expected exception
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_THROWS_AS( thisDoesntThrow() )
 because no exception was thrown where one was expected:
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK_NOTHROW( thisThrows() )
 due to unexpected exception with message:
   expected exception
@@ -1061,24 +1061,24 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp:
+ExceptionTests.cpp:<line number>:
 PASSED:
   CHECK( 1 == 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   {Unknown expression after the reported line}
 due to unexpected exception with message:
   unexpected exception
@@ -1087,20 +1087,20 @@
 ./failing/exceptions/implicit/3
   section name
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   unexpected exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/implicit/4
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   CHECK( thisThrows() == 0 )
 due to unexpected exception with message:
   expected exception
@@ -1108,7 +1108,7 @@
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/implicit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
 
@@ -1117,20 +1117,20 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   custom exception
 
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/nothrow
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -1138,10 +1138,10 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/throw
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
   REQUIRE_THROWS_AS( throwCustom() )
 due to unexpected exception with message:
   custom exception - not std
@@ -1149,36 +1149,36 @@
 -------------------------------------------------------------------------------
 ./failing/exceptions/custom/double
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp: FAILED:
+ExceptionTests.cpp:<line number>: FAILED:
 due to unexpected exception with message:
   3.14
 
 -------------------------------------------------------------------------------
 ./succeeding/exceptions/notimplemented
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp:
+ExceptionTests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) )
 
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1187,16 +1187,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1205,16 +1205,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1223,16 +1223,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1241,16 +1241,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1259,16 +1259,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1277,16 +1277,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1295,16 +1295,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1313,16 +1313,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1331,16 +1331,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1349,16 +1349,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1367,16 +1367,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1385,16 +1385,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1403,16 +1403,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1421,16 +1421,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1439,16 +1439,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1457,16 +1457,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1475,16 +1475,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1493,16 +1493,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1511,16 +1511,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1529,16 +1529,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1547,16 +1547,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1565,16 +1565,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1583,16 +1583,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1601,16 +1601,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1619,16 +1619,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1637,16 +1637,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1655,16 +1655,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1673,16 +1673,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1691,16 +1691,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1709,16 +1709,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1727,16 +1727,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1745,16 +1745,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1763,16 +1763,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1781,16 +1781,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1799,16 +1799,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1817,16 +1817,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1835,16 +1835,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1853,16 +1853,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1871,16 +1871,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1889,16 +1889,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1907,16 +1907,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1925,16 +1925,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1943,16 +1943,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1961,16 +1961,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1979,16 +1979,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -1997,16 +1997,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2015,16 +2015,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2033,16 +2033,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2051,16 +2051,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2069,16 +2069,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2087,16 +2087,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2105,16 +2105,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2123,16 +2123,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2141,16 +2141,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2159,16 +2159,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2177,16 +2177,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2195,16 +2195,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2213,16 +2213,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2231,16 +2231,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2249,16 +2249,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2267,16 +2267,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2285,16 +2285,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2303,16 +2303,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2321,16 +2321,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2339,16 +2339,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2357,16 +2357,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   8 == 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2375,16 +2375,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2393,16 +2393,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   30 == 30
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2411,16 +2411,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   40 == 40
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2429,16 +2429,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2447,16 +2447,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( i, 2 ) == i*2 )
 with expansion:
   72 == 72
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( multiply( j, 2 ) == j*2 )
 with expansion:
@@ -2465,10 +2465,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
@@ -2477,10 +2477,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/generators/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp
+GeneratorTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/GeneratorTests.cpp:
+GeneratorTests.cpp:<line number>:
 PASSED:
   CATCH_REQUIRE( i->first == i->second-1 )
 with expansion:
@@ -2489,10 +2489,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/message
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 warning:
   this is a message
   this is a warning
@@ -2503,10 +2503,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/succeed
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
 with message:
   this is a success
@@ -2514,10 +2514,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/info/1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   REQUIRE( a == 1 )
 with expansion:
   2 == 1
@@ -2528,10 +2528,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/info/2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2539,21 +2539,21 @@
 with message:
   this message may be logged later
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   CHECK( a == 1 )
 with expansion:
   2 == 1
 with message:
   this message should be logged
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   CHECK( a == 0 )
 with expansion:
   2 == 0
 with message:
   and this, but later
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   CHECK( a == 2 )
 with expansion:
@@ -2564,10 +2564,10 @@
 -------------------------------------------------------------------------------
 ./failing/message/fail
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   This is a failure
 
@@ -2575,10 +2575,10 @@
 ./failing/message/sections
   one
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section one
 
@@ -2586,10 +2586,10 @@
 ./failing/message/sections
   two
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Message from section two
 
@@ -2598,7 +2598,7 @@
 ./succeeding/message/sections/stdout
   one
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2609,7 +2609,7 @@
 ./succeeding/message/sections/stdout
   two
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2618,10 +2618,10 @@
 -------------------------------------------------------------------------------
 ./mixed/message/scoped
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2630,7 +2630,7 @@
   current counter 0
   i := 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2639,7 +2639,7 @@
   current counter 1
   i := 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2648,7 +2648,7 @@
   current counter 2
   i := 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2657,7 +2657,7 @@
   current counter 3
   i := 3
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2666,7 +2666,7 @@
   current counter 4
   i := 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2675,7 +2675,7 @@
   current counter 5
   i := 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2684,7 +2684,7 @@
   current counter 6
   i := 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2693,7 +2693,7 @@
   current counter 7
   i := 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2702,7 +2702,7 @@
   current counter 8
   i := 8
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 PASSED:
   REQUIRE( i < 10 )
 with expansion:
@@ -2711,7 +2711,7 @@
   current counter 9
   i := 9
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
   REQUIRE( i < 10 )
 with expansion:
   10 < 10
@@ -2722,10 +2722,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/nofail
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp:
+MessageTests.cpp:<line number>:
 FAILED - but was ok:
   CHECK_NOFAIL( 1 == 2 )
 
@@ -2735,7 +2735,7 @@
 -------------------------------------------------------------------------------
 just info
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2744,10 +2744,10 @@
 -------------------------------------------------------------------------------
 just failure
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp: FAILED:
+MessageTests.cpp:<line number>: FAILED:
 explicitly with message:
   Previous info should not be seen
 
@@ -2755,16 +2755,16 @@
 ./succeeding/Misc/Sections
   s1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -2774,10 +2774,10 @@
 ./succeeding/Misc/Sections
   s2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -2787,16 +2787,16 @@
 ./succeeding/Misc/Sections/nested
   s1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -2806,16 +2806,16 @@
 ./succeeding/Misc/Sections/nested
   s1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
   1 != 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( b != a )
 with expansion:
@@ -2826,10 +2826,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -2840,10 +2840,10 @@
   s1
   s2
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
@@ -2853,10 +2853,10 @@
   s1
   s3
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a != b )
 with expansion:
@@ -2867,10 +2867,10 @@
   s1
   s4
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( a < b )
 with expansion:
@@ -2881,7 +2881,7 @@
   c
   d (leaf)
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2892,7 +2892,7 @@
   c
   e (leaf)
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2902,7 +2902,7 @@
 ./Sections/nested/a/b
   f (leaf)
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2912,10 +2912,10 @@
 ./mixed/Misc/Sections/loops
   s1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
@@ -2923,24 +2923,24 @@
 -------------------------------------------------------------------------------
 ./mixed/Misc/loops
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[0] (1) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[1] (1) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -2948,21 +2948,21 @@
 with message:
   Testing if fib[2] (2) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[3] (3) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[4] (5) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
@@ -2970,14 +2970,14 @@
 with message:
   Testing if fib[5] (8) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
 with message:
   Testing if fib[6] (13) is even
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK( ( fib[i] % 2 ) == 0 )
 with expansion:
   1 == 0
@@ -2989,7 +2989,7 @@
 -------------------------------------------------------------------------------
 ./succeeding/Misc/stdout,stderr
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -2998,16 +2998,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Misc/null strings
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( makeString( false ) != static_cast<char*>(__null) )
 with expansion:
   "valid string" != {null string}
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( makeString( true ) == static_cast<char*>(__null) )
 with expansion:
@@ -3016,10 +3016,10 @@
 -------------------------------------------------------------------------------
 ./failing/info
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with messages:
   hi
@@ -3028,16 +3028,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/checkedif
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECKED_IF( flag )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( testCheckedIf( true ) )
 with expansion:
@@ -3046,15 +3046,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedif
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECKED_IF( flag )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
@@ -3062,16 +3062,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/checkedelse
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECKED_ELSE( flag )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( testCheckedElse( true ) )
 with expansion:
@@ -3080,15 +3080,15 @@
 -------------------------------------------------------------------------------
 ./failing/checkedelse
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECKED_ELSE( flag )
 with expansion:
   false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
@@ -3097,7 +3097,7 @@
 ./misc/xmlentitycheck
   embedded xml
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -3107,7 +3107,7 @@
 ./misc/xmlentitycheck
   encoded chars
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -3116,10 +3116,10 @@
 -------------------------------------------------------------------------------
 ./manual/onechar
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   REQUIRE( false )
 with message:
   3
@@ -3127,10 +3127,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/atomic if
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( x == 0 )
 with expansion:
@@ -3139,28 +3139,28 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( testStringForMatching() Contains( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "string"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() Contains( "abc" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "abc"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() StartsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "this"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() EndsWith( "substring" ) )
 with expansion:
@@ -3169,10 +3169,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Contains
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() Contains( "not there" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there"
@@ -3180,10 +3180,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/StartsWith
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() StartsWith( "string" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string"
@@ -3191,10 +3191,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/EndsWith
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() EndsWith( "this" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this"
@@ -3202,10 +3202,10 @@
 -------------------------------------------------------------------------------
 ./failing/matchers/Equals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
   CHECK_THAT( testStringForMatching() Equals( "something else" ) )
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else"
@@ -3213,10 +3213,10 @@
 -------------------------------------------------------------------------------
 string
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( "" Equals(__null) )
 with expansion:
@@ -3225,10 +3225,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/AllOf
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) )
 with expansion:
@@ -3238,17 +3238,17 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/AnyOf
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) )
 with expansion:
   "this string contains 'abc' as a substring" ( contains: "string" or contains:
   "not there" )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) )
 with expansion:
@@ -3258,10 +3258,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/matchers/Equals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) )
 with expansion:
@@ -3271,34 +3271,34 @@
 -------------------------------------------------------------------------------
 Factorials are computed
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(0) == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(1) == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(2) == 2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(3) == 6 )
 with expansion:
   6 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( Factorial(10) == 3628800 )
 with expansion:
@@ -3307,7 +3307,7 @@
 -------------------------------------------------------------------------------
 empty
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -3316,10 +3316,10 @@
 -------------------------------------------------------------------------------
 Nice descriptive name
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 warning:
   This one ran
 
@@ -3329,7 +3329,7 @@
 -------------------------------------------------------------------------------
 first tag
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -3338,7 +3338,7 @@
 -------------------------------------------------------------------------------
 second tag
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
 
@@ -3347,16 +3347,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3365,16 +3365,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3384,16 +3384,16 @@
 vectors can be sized and resized
   resizing bigger changes size and capacity
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -3402,16 +3402,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3421,16 +3421,16 @@
 vectors can be sized and resized
   resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
   0 == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3439,16 +3439,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3458,16 +3458,16 @@
 vectors can be sized and resized
   resizing smaller changes size but not capacity
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
   0 == 0
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3478,10 +3478,10 @@
   resizing smaller changes size but not capacity
   We can use the 'swap trick' to reset the capacity
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() == 0 )
 with expansion:
@@ -3490,16 +3490,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3509,16 +3509,16 @@
 vectors can be sized and resized
   reserving bigger changes capacity but not size
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -3527,16 +3527,16 @@
 -------------------------------------------------------------------------------
 vectors can be sized and resized
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3546,16 +3546,16 @@
 vectors can be sized and resized
   reserving smaller does not change size or capacity
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 5 )
 with expansion:
@@ -3564,20 +3564,20 @@
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
@@ -3586,10 +3586,10 @@
   Outer
   Inner
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp:
+MiscTests.cpp:<line number>:
 PASSED:
 with message:
   that's not flying - that's failing in style
@@ -3597,10 +3597,10 @@
 -------------------------------------------------------------------------------
 ./failing/CatchSectionInfiniteLoop
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp: FAILED:
+MiscTests.cpp:<line number>: FAILED:
 explicitly with message:
   to infinity and beyond
 
@@ -3609,145 +3609,145 @@
   selftest/expected result
   selftest/expected result/failing tests
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests failed, as expected
@@ -3757,239 +3757,239 @@
   selftest/expected result
   selftest/expected result/succeeding tests
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
 Message from section one
 Message from section two
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
 Some information
 An error
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/catch_self_test.hpp:
+catch_self_test.hpp:<line number>:
 PASSED:
 with message:
   Tests passed, as expected
@@ -4003,16 +4003,16 @@
   selftest/test counts
   selftest/test counts/succeeding tests
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.passed == 298 )
 with expansion:
   298 == 298
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.failed == 0 )
 with expansion:
@@ -4023,16 +4023,16 @@
   selftest/test counts
   selftest/test counts/failing tests
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.passed == 2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.failed == 77 )
 with expansion:
@@ -4041,16 +4041,16 @@
 -------------------------------------------------------------------------------
 meta/Misc/Sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.passed == 2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( totals.assertions.failed == 1 )
 with expansion:
@@ -4060,32 +4060,32 @@
 Process can be configured on command line
   default - no arguments
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.shouldDebugBreak == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.abortAfter == -1 )
 with expansion:
   -1 == -1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.noThrow == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.reporterName.empty() )
 with expansion:
@@ -4096,26 +4096,26 @@
   test lists
   1 test
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
@@ -4126,26 +4126,26 @@
   test lists
   Specify one test case exclusion using exclude:
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -4156,26 +4156,26 @@
   test lists
   Specify one test case exclusion using ~
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) )
 with expansion:
@@ -4186,32 +4186,32 @@
   test lists
   Specify two test cases using -t
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters().size() == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test1" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( cfg.filters()[0].shouldInclude( fakeTestCase( "test2" ) ) )
 with expansion:
@@ -4222,14 +4222,14 @@
   reporter
   -r/console
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterName == "console" )
 with expansion:
@@ -4240,14 +4240,14 @@
   reporter
   -r/xml
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterName == "xml" )
 with expansion:
@@ -4258,14 +4258,14 @@
   reporter
   --reporter/junit
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.reporterName == "junit" )
 with expansion:
@@ -4276,14 +4276,14 @@
   debugger
   -b
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.shouldDebugBreak == true )
 with expansion:
@@ -4294,14 +4294,14 @@
   debugger
   --break
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.shouldDebugBreak )
 with expansion:
@@ -4312,14 +4312,14 @@
   abort
   -a aborts after first failure
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.abortAfter == 1 )
 with expansion:
@@ -4330,14 +4330,14 @@
   abort
   -x 2 aborts after two failures
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.abortAfter == 2 )
 with expansion:
@@ -4348,10 +4348,10 @@
   abort
   -x must be greater than zero
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) )
 with expansion:
@@ -4364,10 +4364,10 @@
   abort
   -x must be numeric
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) )
 with expansion:
@@ -4379,14 +4379,14 @@
   nothrow
   -e
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.noThrow == true )
 with expansion:
@@ -4397,14 +4397,14 @@
   nothrow
   --nothrow
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.noThrow == true )
 with expansion:
@@ -4415,14 +4415,14 @@
   output filename
   -o filename
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4433,14 +4433,14 @@
   output filename
   --out
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( config.outputFilename == "filename.ext" )
 with expansion:
@@ -4451,26 +4451,26 @@
   combinations
   Single character flags can be combined
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_NOTHROW( parseIntoConfig( argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.abortAfter == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.shouldDebugBreak )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( config.noThrow == true )
 with expansion:
@@ -4479,40 +4479,40 @@
 -------------------------------------------------------------------------------
 selftest/test filter
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false )
 with expansion:
@@ -4521,28 +4521,28 @@
 -------------------------------------------------------------------------------
 selftest/test filters
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false )
 with expansion:
@@ -4551,16 +4551,16 @@
 -------------------------------------------------------------------------------
 selftest/filter/prefix wildcard
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false )
 with expansion:
@@ -4569,28 +4569,28 @@
 -------------------------------------------------------------------------------
 selftest/filter/wildcard at both ends
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false )
 with expansion:
@@ -4600,52 +4600,52 @@
 selftest/tags
   one tag
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.hasTag( "one" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.getTags().size() == 1 )
 with expansion:
   1 == 1
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( p3 ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( p4 ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( p5 ) == false )
 with expansion:
@@ -4655,70 +4655,70 @@
 selftest/tags
   two tags
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.hasTag( "one" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.hasTag( "two" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.hasTag( "Two" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.hasTag( "three" ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.getTags().size() == 2 )
 with expansion:
   2 == 2
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.matchesTags( p1 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.matchesTags( p2 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.matchesTags( p3 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.matchesTags( p4 ) == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( twoTags.matchesTags( p5 ) == true )
 with expansion:
@@ -4728,46 +4728,46 @@
 selftest/tags
   complex
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( fakeTestCase( "test", "[one][.]" ).matchesTags( p1 ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_FALSE( fakeTestCase( "test", "[one][.]" ).matchesTags( p5 ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p4 ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( fakeTestCase( "test", "[three]" ).matchesTags( p5 ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( fakeTestCase( "test", "[three]" ).matchesTags( "[three]~[one]" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK_FALSE( fakeTestCase( "test", "[unit][not_apple]" ).matchesTags( "[unit]~[not_apple]" ) )
 with expansion:
@@ -4777,28 +4777,28 @@
 selftest/tags
   one tag with characters either side
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" )
 with expansion:
   "1234" == "1234"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "one" ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagWithExtras.hasTag( "two" ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagWithExtras.getTags().size() == 1 )
 with expansion:
@@ -4808,22 +4808,22 @@
 selftest/tags
   start of a tag, but not closed
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagOpen.getTestCaseInfo().description == "[one" )
 with expansion:
   "[one" == "[one"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagOpen.hasTag( "one" ) == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTagOpen.getTags().size() == 0 )
 with expansion:
@@ -4833,28 +4833,28 @@
 selftest/tags
   hidden
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.getTestCaseInfo().description == "" )
 with expansion:
   "" == ""
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.hasTag( "." ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.isHidden() )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( oneTag.matchesTags( "~[.]" ) == false )
 with expansion:
@@ -4865,10 +4865,10 @@
   plain string
   No wrapping
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
@@ -4876,7 +4876,7 @@
   ==
   "one two three four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
@@ -4889,10 +4889,10 @@
   plain string
   Wrapped once
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -4902,7 +4902,7 @@
   "one two three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -4912,7 +4912,7 @@
   "one two three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -4922,7 +4922,7 @@
   "one two three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" )
 with expansion:
@@ -4932,7 +4932,7 @@
   "one two three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" )
 with expansion:
@@ -4947,10 +4947,10 @@
   plain string
   Wrapped twice
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -4962,7 +4962,7 @@
   three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -4974,7 +4974,7 @@
   three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -4991,10 +4991,10 @@
   plain string
   Wrapped three times
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5008,7 +5008,7 @@
   three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5027,10 +5027,10 @@
   plain string
   Short wrap
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" )
 with expansion:
@@ -5040,7 +5040,7 @@
   "abc-
   def"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" )
 with expansion:
@@ -5050,7 +5050,7 @@
   "abc-
   defg"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" )
 with expansion:
@@ -5062,7 +5062,7 @@
   def-
   gh"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" )
 with expansion:
@@ -5078,7 +5078,7 @@
   ee
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" )
 with expansion:
@@ -5101,34 +5101,34 @@
   plain string
   As container
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   REQUIRE( text.size() == 4 )
 with expansion:
   4 == 4
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( text[0] == "one" )
 with expansion:
   "one" == "one"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( text[1] == "two" )
 with expansion:
   "two" == "two"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( text[2] == "three" )
 with expansion:
   "three" == "three"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( text[3] == "four" )
 with expansion:
@@ -5139,10 +5139,10 @@
   plain string
   Indent first line differently
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( text.toString() == " one two\n    three\n    four" )
 with expansion:
@@ -5159,10 +5159,10 @@
   With newlines
   No wrapping
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString )
 with expansion:
@@ -5172,7 +5172,7 @@
   "one two
   three four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString )
 with expansion:
@@ -5182,7 +5182,7 @@
   "one two
   three four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString )
 with expansion:
@@ -5197,10 +5197,10 @@
   With newlines
   Trailing newline
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" )
 with expansion:
@@ -5210,13 +5210,13 @@
   "abcdef
   "
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" )
 with expansion:
   "abcdef" == "abcdef"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" )
 with expansion:
@@ -5231,10 +5231,10 @@
   With newlines
   Wrapped once
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5246,7 +5246,7 @@
   three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5258,7 +5258,7 @@
   three
   four"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" )
 with expansion:
@@ -5275,10 +5275,10 @@
   With newlines
   Wrapped twice
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" )
 with expansion:
@@ -5296,10 +5296,10 @@
 Long strings can be wrapped
   With tabs
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n        four\n        five\n        six" )
 with expansion:
@@ -5318,7 +5318,7 @@
 -------------------------------------------------------------------------------
 Strings can be rendered with colour
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
 
@@ -5327,16 +5327,16 @@
 -------------------------------------------------------------------------------
 Text can be formatted using the Text class
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp
+TestMain.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "hi there" ).toString() == "hi there" )
 with expansion:
   "hi there" == "hi there"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp:
+TestMain.cpp:<line number>:
 PASSED:
   CHECK( Text( "hi there", narrow ).toString() == "hi\nthere" )
 with expansion:
@@ -5349,10 +5349,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/Tricky/std::pair
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( (std::pair<int, int>( 1, 2 )) == aNicePair )
 with expansion:
@@ -5361,10 +5361,10 @@
 -------------------------------------------------------------------------------
 ./inprogress/failing/Tricky/trailing expression
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -5375,10 +5375,10 @@
 -------------------------------------------------------------------------------
 ./inprogress/failing/Tricky/compound lhs
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 warning:
   Uncomment the code in this test to check that it gives a sensible compiler
   error
@@ -5389,15 +5389,15 @@
 -------------------------------------------------------------------------------
 ./failing/Tricky/non streamable type
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   CHECK( &o1 == &o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
@@ -5405,10 +5405,10 @@
 -------------------------------------------------------------------------------
 ./failing/string literals
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp: FAILED:
+TrickyTests.cpp:<line number>: FAILED:
   REQUIRE( std::string( "first" ) == "second" )
 with expansion:
   "first" == "second"
@@ -5416,16 +5416,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/side-effects
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( i++ == 7 )
 with expansion:
   7 == 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( i++ == 8 )
 with expansion:
@@ -5434,10 +5434,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/koenig
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0x<hex digits> == o )
 with expansion:
@@ -5446,10 +5446,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/non-const==
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( t == 1u )
 with expansion:
@@ -5458,10 +5458,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/enum/bits
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0x<hex digits> == bit30and31 )
 with expansion:
@@ -5470,10 +5470,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/boolean member
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( obj.prop != __null )
 with expansion:
@@ -5483,16 +5483,16 @@
 ./succeeding/unimplemented static bool
   compare to true
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<true>::value == true )
 with expansion:
   true == true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( true == is_true<true>::value )
 with expansion:
@@ -5502,16 +5502,16 @@
 ./succeeding/unimplemented static bool
   compare to false
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<false>::value == false )
 with expansion:
   false == false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( false == is_true<false>::value )
 with expansion:
@@ -5521,10 +5521,10 @@
 ./succeeding/unimplemented static bool
   negation
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( !is_true<false>::value )
 with expansion:
@@ -5534,10 +5534,10 @@
 ./succeeding/unimplemented static bool
   double negation
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( !!is_true<true>::value )
 with expansion:
@@ -5547,16 +5547,16 @@
 ./succeeding/unimplemented static bool
   direct
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( is_true<true>::value )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( is_true<false>::value )
 with expansion:
@@ -5565,22 +5565,22 @@
 -------------------------------------------------------------------------------
 ./succeeding/SafeBool
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   CHECK( True )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   CHECK( !False )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( False )
 with expansion:
@@ -5589,10 +5589,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5601,10 +5601,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5614,10 +5614,10 @@
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5626,10 +5626,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5639,10 +5639,10 @@
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5653,10 +5653,10 @@
   A section
   Another section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5665,10 +5665,10 @@
 -------------------------------------------------------------------------------
 Assertions then sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5678,10 +5678,10 @@
 Assertions then sections
   A section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5692,10 +5692,10 @@
   A section
   Another other section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( Catch::isTrue( true ) )
 with expansion:
@@ -5704,10 +5704,10 @@
 -------------------------------------------------------------------------------
 non streamable - with conv. op
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( s == "7" )
 with expansion:
@@ -5716,16 +5716,16 @@
 -------------------------------------------------------------------------------
 Comparing function pointers
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( a )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( a == &foo )
 with expansion:
@@ -5734,10 +5734,10 @@
 -------------------------------------------------------------------------------
 pointer to class
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
   REQUIRE( p == 0 )
 with expansion:
@@ -5746,46 +5746,46 @@
 -------------------------------------------------------------------------------
 X/level/0/a
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/0/b
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/1/a
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 X/level/1/b
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp:
+TrickyTests.cpp:<line number>:
 PASSED:
 
 -------------------------------------------------------------------------------
 Anonymous test case 1
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp
+VariadicMacrosTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp:
+VariadicMacrosTests.cpp:<line number>:
 PASSED:
 with message:
   anonymous test case
@@ -5793,10 +5793,10 @@
 -------------------------------------------------------------------------------
 Test case with one argument
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp
+VariadicMacrosTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp:
+VariadicMacrosTests.cpp:<line number>:
 PASSED:
 with message:
   no assertions
@@ -5805,10 +5805,10 @@
 Variadic macros
   Section with one argument
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp
+VariadicMacrosTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/VariadicMacrosTests.cpp:
+VariadicMacrosTests.cpp:<line number>:
 PASSED:
 with message:
   no assertions
@@ -5819,10 +5819,10 @@
       When: I do this
       Then: it should do this
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( itDoesThis() )
 with expansion:
@@ -5834,10 +5834,10 @@
       When: I do this
       Then: it should do this
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( itDoesThis() )
 with expansion:
@@ -5850,10 +5850,10 @@
       Then: it should do this
        And: do that
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( itDoesThat() )
 with expansion:
@@ -5863,10 +5863,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5876,10 +5876,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5889,10 +5889,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5904,16 +5904,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5923,10 +5923,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5938,16 +5938,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5957,10 +5957,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -5972,16 +5972,16 @@
       When: it is made larger
       Then: the size and capacity go up
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 10 )
 with expansion:
   10 == 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -5995,16 +5995,16 @@
   And when: it is made smaller again
       Then: the size goes down but the capacity stays the same
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
@@ -6014,10 +6014,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -6027,10 +6027,10 @@
 Scenario: Vector resizing affects size and capacity
      Given: an empty vector
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -6042,16 +6042,16 @@
       When: we reserve more space
       Then: The capacity is increased but the size remains the same
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.capacity() >= 10 )
 with expansion:
   10 >= 10
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
   REQUIRE( v.size() == 0 )
 with expansion:
@@ -6067,10 +6067,10 @@
       Then: The, deliberately very long and overly verbose (you see what I did
             there?) section names must wrap, along with an indent
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp
+BDDTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp:
+BDDTests.cpp:<line number>:
 PASSED:
 with message:
   boo!
@@ -6079,10 +6079,10 @@
 cmdline
   process name
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.processName == "test" )
 with expansion:
@@ -6092,10 +6092,10 @@
 cmdline
   arg separated by spaces
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6105,10 +6105,10 @@
 cmdline
   arg separated by colon
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6118,10 +6118,10 @@
 cmdline
   arg separated by =
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.fileName == "filename.ext" )
 with expansion:
@@ -6131,10 +6131,10 @@
 cmdline
   long opt
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.fileName == "%stdout" )
 with expansion:
@@ -6144,10 +6144,10 @@
 cmdline
   a number
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.number == 42 )
 with expansion:
@@ -6157,14 +6157,14 @@
 cmdline
   not a number
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK_THROWS( parseInto( cli, argv, config ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config.number == 0 )
 with expansion:
@@ -6174,22 +6174,22 @@
 cmdline
   two parsers
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config1.number == 42 )
 with expansion:
   42 == 42
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE_FALSE( unusedTokens.empty() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   CHECK( config2.description == "some text" )
 with expansion:
@@ -6200,10 +6200,10 @@
   methods
   in range
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.index == 3 )
 with expansion:
@@ -6214,10 +6214,10 @@
   methods
   out of range
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE_THROWS( parseInto( cli, argv, config ) )
 
@@ -6226,10 +6226,10 @@
   flags
   set
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.flag )
 with expansion:
@@ -6240,10 +6240,10 @@
   flags
   not set
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.flag == false )
 with expansion:
@@ -6253,22 +6253,22 @@
 cmdline
   positional
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp
+CmdLineTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.firstPos == "1st" )
 with expansion:
   "1st" == "1st"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.secondPos == "2nd" )
 with expansion:
   "2nd" == "2nd"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp:
+CmdLineTests.cpp:<line number>:
 PASSED:
   REQUIRE( config.unpositional == "3rd" )
 with expansion:
@@ -6277,10 +6277,10 @@
 -------------------------------------------------------------------------------
 section tracking
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
@@ -6289,10 +6289,10 @@
 -------------------------------------------------------------------------------
 section tracking
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
@@ -6302,16 +6302,16 @@
 section tracking
   test case with no sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.isCompleted() )
 with expansion:
@@ -6320,10 +6320,10 @@
 -------------------------------------------------------------------------------
 section tracking
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
@@ -6333,34 +6333,34 @@
 section tracking
   test case with one section
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.isCompleted() )
 with expansion:
@@ -6369,10 +6369,10 @@
 -------------------------------------------------------------------------------
 section tracking
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
@@ -6382,58 +6382,58 @@
 section tracking
   test case with two consecutive sections
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section2Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.isCompleted() )
 with expansion:
@@ -6442,10 +6442,10 @@
 -------------------------------------------------------------------------------
 section tracking
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
@@ -6455,52 +6455,52 @@
 section tracking
   test case with one section within another
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp
+SectionTrackerTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.enterSection( section2Name ) )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK_FALSE( testCaseTracker.isCompleted() )
 with expansion:
   !false
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section1Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.enterSection( section2Name ) )
 with expansion:
   true
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp:
+SectionTrackerTests.cpp:<line number>:
 PASSED:
   CHECK( testCaseTracker.isCompleted() )
 with expansion:
diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt
index b6eeced..eedab65 100644
--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -6,40 +6,40 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/simple
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.22 ) )
 with expansion:
   1.23 != Approx( 1.22 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.24 ) )
 with expansion:
   1.23 != Approx( 1.24 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.22 )
 with expansion:
   Approx( 1.23 ) != 1.22
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( Approx( d ) != 1.24 )
 with expansion:
@@ -48,16 +48,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/epsilon
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != Approx( 1.231 ) )
 with expansion:
   1.23 != Approx( 1.231 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) )
 with expansion:
@@ -66,16 +66,16 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/float
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.23f == Approx( 1.23f ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0.0f == Approx( 0.0f ) )
 with expansion:
@@ -84,48 +84,48 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/int
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1 == Approx( 1 ) )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( 0 ) )
 
 -------------------------------------------------------------------------------
 ./succeeding/Approx/mixed
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.0f == Approx( 1 ) )
 with expansion:
   1 == Approx( 1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dZero) )
 with expansion:
   0 == Approx( 0 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) )
 with expansion:
   0 == Approx( 1e-05 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( 1.234f == Approx( dMedium ) )
 with expansion:
   1.234 == Approx( 1.234 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( dMedium == Approx( 1.234f ) )
 with expansion:
@@ -134,52 +134,52 @@
 -------------------------------------------------------------------------------
 ./succeeding/Approx/custom
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.23 ) )
 with expansion:
   1.23 == Approx( 1.23 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.22 ) )
 with expansion:
   1.23 == Approx( 1.22 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d == approx( 1.24 ) )
 with expansion:
   1.23 == Approx( 1.24 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( d != approx( 1.25 ) )
 with expansion:
   1.23 != Approx( 1.25 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.23 )
 with expansion:
   Approx( 1.23 ) == 1.23
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.22 )
 with expansion:
   Approx( 1.23 ) == 1.22
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) == 1.24 )
 with expansion:
   Approx( 1.23 ) == 1.24
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( approx( d ) != 1.25 )
 with expansion:
@@ -188,16 +188,16 @@
 -------------------------------------------------------------------------------
 Approximate PI
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp
+ApproxTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) )
 with expansion:
   3.1428571429 == Approx( 3.141 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ApproxTests.cpp:
+ApproxTests.cpp:<line number>:
 PASSED:
   REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) )
 with expansion:
@@ -206,10 +206,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/TestClass/succeedingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
+ClassTests.cpp:<line number>:
 PASSED:
   REQUIRE( s == "hello" )
 with expansion:
@@ -218,10 +218,10 @@
 -------------------------------------------------------------------------------
 ./failing/TestClass/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
@@ -229,10 +229,10 @@
 -------------------------------------------------------------------------------
 ./succeeding/Fixture/succeedingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp:
+ClassTests.cpp:<line number>:
 PASSED:
   REQUIRE( m_a == 1 )
 with expansion:
@@ -241,10 +241,10 @@
 -------------------------------------------------------------------------------
 ./failing/Fixture/failingCase
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp: FAILED:
+ClassTests.cpp:<line number>: FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
@@ -252,46 +252,46 @@
 -------------------------------------------------------------------------------
 ./succeeding/conditions/equality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.int_seven == 7 )
 with expansion:
   7 == 7
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.float_nine_point_one == Approx( 9.1f ) )
 with expansion:
   9.1 == Approx( 9.1 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.double_pi == Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 == Approx( 3.14159 )
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello == "hello" )
 with expansion:
   "hello" == "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( "hello" == data.str_hello )
 with expansion:
   "hello" == "hello"
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( data.str_hello.size() == 5 )
 with expansion:
   5 == 5
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp:
+ConditionTests.cpp:<line number>:
 PASSED:
   REQUIRE( x == Approx( 1.3 ) )
 with expansion:
@@ -300,15 +300,15 @@
 -------------------------------------------------------------------------------
 ./failing/conditions/equality
 -------------------------------------------------------------------------------
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
 ...............................................................................
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
 
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp: FAILED:
+ConditionTests.cpp:<line number>: FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 08cf399..6b256f7 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -10,133 +10,133 @@
     <testcase classname="TestClass" name="./succeeding/TestClass/succeedingCase" time="{duration}"/>
     <testcase classname="TestClass" name="./failing/TestClass/failingCase" time="{duration}">
       <failure message="&quot;hello&quot; == &quot;world&quot;" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="Fixture" name="./succeeding/Fixture/succeedingCase" time="{duration}"/>
     <testcase classname="Fixture" name="./failing/Fixture/failingCase" time="{duration}">
       <failure message="1 == 2" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ClassTests.cpp
+ClassTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/equality" time="{duration}"/>
     <testcase classname="global" name="./failing/conditions/equality" time="{duration}">
       <failure message="7 == 6" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 == 8" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 == 0" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 == Approx( 9.11 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 == Approx( 9 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 == Approx( 1 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 == Approx( 0 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="3.1415926535 == Approx( 3.1415 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;goodbye&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;hell&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; == &quot;hello1&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="5 == 6" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="1.3 == Approx( 1.301 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/inequality" time="{duration}"/>
     <testcase classname="global" name="./failing/conditions/inequality" time="{duration}">
       <failure message="7 != 7" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 != Approx( 9.1 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="3.1415926535 != Approx( 3.14159 )" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; != &quot;hello&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="5 != 5" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/ordered" time="{duration}"/>
     <testcase classname="global" name="./failing/conditions/ordered" time="{duration}">
       <failure message="7 > 7" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 7" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 > 8" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 6" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 &lt; 0" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 &lt; -1" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 >= 8" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="7 &lt;= 6" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 &lt; 9" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 > 10" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="9.1 > 9.2" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;hello&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hello&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;hellp&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; > &quot;z&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;hellm&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt; &quot;a&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; >= &quot;z&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="&quot;hello&quot; &lt;= &quot;a&quot;" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/conditions/int literals" time="{duration}"/>
@@ -148,90 +148,90 @@
     <testcase classname="global" name="./succeeding/conditions/not" time="{duration}"/>
     <testcase classname="global" name="./failing/conditions/not" time="{duration}">
       <failure message="false != false" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="true != true" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="!true" type="CHECK_FALSE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
       <failure message="!(1 == 1)" type="CHECK_FALSE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
+ConditionTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/explicit" time="{duration}"/>
     <testcase classname="global" name="./failing/exceptions/explicit" time="{duration}">
       <error message="thisThrows()" type="CHECK_THROWS_AS">
 expected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
       <failure message="thisDoesntThrow()" type="CHECK_THROWS_AS">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </failure>
       <error message="thisThrows()" type="CHECK_NOTHROW">
 expected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit" time="{duration}">
       <error type="TEST_CASE">
 unexpected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/2" time="{duration}">
       <error message="{Unknown expression after the reported line}">
 unexpected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="./failing/exceptions/implicit/3" name="section name" time="{duration}">
       <error type="TEST_CASE">
 unexpected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/implicit/4" time="{duration}">
       <error message="thisThrows() == 0" type="CHECK">
 expected exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom" time="{duration}">
       <error type="TEST_CASE">
 custom exception
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/nothrow" time="{duration}">
       <error message="throwCustom()" type="REQUIRE_NOTHROW">
 custom exception - not std
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/throw" time="{duration}">
       <error message="throwCustom()" type="REQUIRE_THROWS_AS">
 custom exception - not std
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./failing/exceptions/custom/double" time="{duration}">
       <error type="TEST_CASE">
 3.14
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
+ExceptionTests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="global" name="./succeeding/exceptions/notimplemented" time="{duration}"/>
@@ -243,35 +243,35 @@
       <failure message="2 == 1" type="REQUIRE">
 this message should be logged
 so should this
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/message/info/2" time="{duration}">
       <failure message="2 == 1" type="CHECK">
 this message should be logged
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
       <failure message="2 == 0" type="CHECK">
 and this, but later
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/message/fail" time="{duration}">
       <failure type="FAIL">
 This is a failure
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./failing/message/sections" name="one" time="{duration}">
       <failure type="FAIL">
 Message from section one
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./failing/message/sections" name="two" time="{duration}">
       <failure type="FAIL">
 Message from section two
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./succeeding/message/sections/stdout" name="two" time="{duration}">
@@ -284,14 +284,14 @@
       <failure message="10 &lt; 10" type="REQUIRE">
 current counter 10
 i := 10
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/nofail" time="{duration}"/>
     <testcase classname="global" name="just failure" time="{duration}">
       <failure type="FAIL">
 Previous info should not be seen
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
+MessageTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./succeeding/Misc/Sections" name="s1" time="{duration}"/>
@@ -300,40 +300,40 @@
     <testcase classname="./succeeding/Misc/Sections/nested" name="s1/s2" time="{duration}"/>
     <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s2" time="{duration}">
       <failure message="1 == 2" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s3" time="{duration}"/>
     <testcase classname="./mixed/Misc/Sections/nested2" name="s1/s4" time="{duration}"/>
     <testcase classname="./mixed/Misc/Sections/loops" name="s1" time="{duration}">
       <failure message="0 > 1" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./mixed/Misc/loops" time="{duration}">
       <failure message="1 == 0" type="CHECK">
 Testing if fib[0] (1) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[1] (1) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[3] (3) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[4] (5) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[6] (13) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="1 == 0" type="CHECK">
 Testing if fib[7] (21) is even
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/Misc/stdout,stderr" time="{duration}">
@@ -349,53 +349,53 @@
       <failure message="false" type="REQUIRE">
 hi
 i := 7
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedif" time="{duration}"/>
     <testcase classname="global" name="./failing/checkedif" time="{duration}">
       <failure message="false" type="CHECKED_IF">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="false" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/checkedelse" time="{duration}"/>
     <testcase classname="global" name="./failing/checkedelse" time="{duration}">
       <failure message="false" type="CHECKED_ELSE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure message="false" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./manual/onechar" time="{duration}">
       <failure message="false" type="REQUIRE">
 3
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/atomic if" time="{duration}"/>
     <testcase classname="global" name="./succeeding/matchers" time="{duration}"/>
     <testcase classname="global" name="./failing/matchers/Contains" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; contains: &quot;not there&quot;" type="CHECK_THAT">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/StartsWith" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; starts with: &quot;string&quot;" type="CHECK_THAT">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/EndsWith" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; ends with: &quot;this&quot;" type="CHECK_THAT">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/matchers/Equals" time="{duration}">
       <failure message="&quot;this string contains 'abc' as a substring&quot; equals: &quot;something else&quot;" type="CHECK_THAT">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="string" time="{duration}"/>
@@ -413,15 +413,15 @@
     <testcase classname="./failing/CatchSectionInfiniteLoop" name="root" time="{duration}">
       <failure type="FAIL">
 to infinity and beyond
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure type="FAIL">
 to infinity and beyond
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
       <failure type="FAIL">
 to infinity and beyond
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
+MiscTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="./failing/CatchSectionInfiniteLoop" name="Outer/Inner" time="{duration}"/>
@@ -496,15 +496,15 @@
     <testcase classname="global" name="./inprogress/failing/Tricky/compound lhs" time="{duration}"/>
     <testcase classname="global" name="./failing/Tricky/non streamable type" time="{duration}">
       <failure message="0x<hex digits> == 0x<hex digits>" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
       </failure>
       <failure message="{?} == {?}" type="CHECK">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./failing/string literals" time="{duration}">
       <failure message="&quot;first&quot; == &quot;second&quot;" type="REQUIRE">
-Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp
+TrickyTests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="global" name="./succeeding/side-effects" time="{duration}"/>
diff --git a/projects/SelfTest/makefile b/projects/SelfTest/makefile
new file mode 100644
index 0000000..e5dec0d
--- /dev/null
+++ b/projects/SelfTest/makefile
@@ -0,0 +1,21 @@
+SOURCES =	ApproxTests.cpp \
+			ClassTests.cpp \
+			ConditionTests.cpp \
+      		ExceptionTests.cpp \
+      		GeneratorTests.cpp \
+      		MessageTests.cpp \
+      		MiscTests.cpp \
+      		TestMain.cpp \
+      		TrickyTests.cpp \
+      		BDDTests.cpp \
+      		VariadicMacrosTests.cpp \
+      		catch_self_test.cpp
+OBJECTS    = $(patsubst %.cpp, %.o, $(SOURCES))
+CXX = g++
+CXXFLAGS  = -I../../include
+
+CatchSelfTest: $(OBJECTS)
+	$(CXX) -o $@ $^
+
+clean:
+	rm -f $(OBJECTS)
diff --git a/scripts/approvalTests.py b/scripts/approvalTests.py
index ad28cf9..4d07237 100644
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@@ -7,7 +7,8 @@
 
 rootPath = os.path.join( catchPath, 'projects/SelfTest/Baselines' )
 
-filenameParser = re.compile( r'.*?/(.*\..pp):([0-9]*)(.*)' )
+filenameParser = re.compile( r'.*/(.*\..pp:)(.*)' )
+filelineParser = re.compile( r'(.*\..pp:)([0-9]*)(.*)' )
 lineNumberParser = re.compile( r'(.*)line="[0-9]*"(.*)' )
 hexParser = re.compile( r'(.*)\b(0[xX][0-9a-fA-F]+)\b(.*)' )
 durationsParser = re.compile( r'(.*)time="[0-9]*\.[0-9]*"(.*)' )
@@ -22,7 +23,10 @@
 def filterLine( line ):
 	m = filenameParser.match( line )
 	if m:
-		line = m.group(1) + m.group(3)
+		line = m.group(1) + m.group(2)
+		m = filelineParser.match( line )
+		if m:
+			line = m.group(1) + "<line number>" + m.group(3)
 	else:
 		m = lineNumberParser.match( line )
 		if m: