No, really trim paths in approval tests down to just filenames

2024-11-26 07:16:10 +01:00 · 2013-09-30 08:01:10 +01:00 · 2013-09-30 08:01:10 +01:00 · 16c21ee265
commit 16c21ee265
parent 1e74938538
6 changed files with 1346 additions and 1321 deletions
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@ -6,10 +6,10 @@ Run with -? for options
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 ./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 @@ due to unexpected exception with message:
 ./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 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 ./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 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 ./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 @@ due to unexpected exception with message:
 -------------------------------------------------------------------------------
 ./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 @@ with messages:
 -------------------------------------------------------------------------------
 ./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 @@ with messages:
  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 @@ with message:
 -------------------------------------------------------------------------------
 ./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 @@ explicitly with message:
 ./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 @@ explicitly with message:
 ./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 @@ Message from section two
 -------------------------------------------------------------------------------
 ./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 @@ with messages:
 -------------------------------------------------------------------------------
 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 @@ explicitly with message:
  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 @@ with expansion:
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ An error
 -------------------------------------------------------------------------------
 ./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 @@ with messages:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with message:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ hello
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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"
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@ -6,40 +6,40 @@ Run with -? for options
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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 @@ with expansion:
 -------------------------------------------------------------------------------
 ./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
--- 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 @@ Users/philnash/Dev/OSS/Catch/projects/SelfTest/ConditionTests.cpp
    <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 @@ Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp
      <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 @@ Message from section two
      <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 @@ Users/philnash/Dev/OSS/Catch/projects/SelfTest/MessageTests.cpp
    <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 @@ An error
      <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 @@ Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp
    <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 @@ hello
    <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}"/>
--- a/projects/SelfTest/makefile
+++ 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)
--- a/scripts/approvalTests.py
+++ b/scripts/approvalTests.py
@ -7,7 +7,8 @@ from scriptCommon import catchPath
 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 @@ overallResult = 0
 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: