Improved path normalization in approvalTests.py

Instead of redoing the whole line where path was found, only the
directory part of the path is removed, instead of removing all
of the line before the path starts.

This results in slight change in how junit and sonarqube approvals
come out, and significant change in how TeamCity reporter approvals
come out. This latter difference is the reason for the change,
as now the lines with `testFailed` and `testIgnored` messages
are not completely butchered.

7 files changed, 940 insertions, 943 deletions

diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index e521aec6..795c8171 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -19,7 +19,7 @@
       <failure type="FAIL">
 FAILED:
 1514
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
       <system-out>
 This would not be caught previously
@@ -54,7 +54,7 @@ Nor would this
 FAILED:
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_NOTHROW" time="{duration}" status="run">
@@ -64,7 +64,7 @@ FAILED:
   REQUIRE_NOTHROW( thisThrows() )
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" time="{duration}" status="run"/>
@@ -77,7 +77,7 @@ FAILED:
   CHECK( f() == 0 )
 with expansion:
   1 == 0
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="#872" time="{duration}" status="run"/>
@@ -90,52 +90,52 @@ Misc.tests.cpp:<line number>
       <failure message="false != false" type="CHECK">
 FAILED:
   CHECK( false != false )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="true != true" type="CHECK">
 FAILED:
   CHECK( true != true )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!true" type="CHECK">
 FAILED:
   CHECK( !true )
 with expansion:
   false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!(true)" type="CHECK_FALSE">
 FAILED:
   CHECK_FALSE( true )
 with expansion:
   !true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!trueValue" type="CHECK">
 FAILED:
   CHECK( !trueValue )
 with expansion:
   false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!(trueValue)" type="CHECK_FALSE">
 FAILED:
   CHECK_FALSE( trueValue )
 with expansion:
   !true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!(1 == 1)" type="CHECK">
 FAILED:
   CHECK( !(1 == 1) )
 with expansion:
   false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="!(1 == 1)" type="CHECK_FALSE">
 FAILED:
   CHECK_FALSE( 1 == 1 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="'Not' checks that should succeed" time="{duration}" status="run"/>
@@ -151,7 +151,7 @@ FAILED:
   REQUIRE( s == "world" )
 with expansion:
   "hello" == "world"
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.TestClass" name="A METHOD_AS_TEST_CASE based test run that succeeds" time="{duration}" status="run"/>
@@ -161,7 +161,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>::m_a.size() == 1 )
 with expansion:
   0 == 1
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo&lt;int>" time="{duration}" status="run">
@@ -170,7 +170,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>::m_a.size() == 1 )
 with expansion:
   0 == 1
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;float>" time="{duration}" status="run">
@@ -179,7 +179,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>::m_a.size() == 1 )
 with expansion:
   0 == 1
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;int>" time="{duration}" status="run">
@@ -188,7 +188,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>::m_a.size() == 1 )
 with expansion:
   0 == 1
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo&lt;float>" time="{duration}" status="run"/>
@@ -201,7 +201,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2 )
 with expansion:
   6 &lt; 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;int, 2>" time="{duration}" status="run">
@@ -210,7 +210,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2 )
 with expansion:
   2 &lt; 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;float, 6>" time="{duration}" status="run">
@@ -219,7 +219,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2 )
 with expansion:
   6 &lt; 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;int, 2>" time="{duration}" status="run">
@@ -228,7 +228,7 @@ FAILED:
   REQUIRE( Template_Fixture_2&lt;TestType>{}.m_a.size() &lt; 2 )
 with expansion:
   2 &lt; 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture_2" name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2&lt;float,6>" time="{duration}" status="run"/>
@@ -241,7 +241,7 @@ FAILED:
   REQUIRE( Template_Fixture&lt;TestType>::m_a == 2 )
 with expansion:
   1.0 == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - float" time="{duration}" status="run">
@@ -250,7 +250,7 @@ FAILED:
   REQUIRE( Template_Fixture&lt;TestType>::m_a == 2 )
 with expansion:
   1.0f == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - int" time="{duration}" status="run">
@@ -259,7 +259,7 @@ FAILED:
   REQUIRE( Template_Fixture&lt;TestType>::m_a == 2 )
 with expansion:
   1 == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Template_Fixture" name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double" time="{duration}" status="run"/>
@@ -271,7 +271,7 @@ FAILED:
   REQUIRE( Nttp_Fixture&lt;V>::value == 0 )
 with expansion:
   1 == 0
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3" time="{duration}" status="run">
@@ -280,7 +280,7 @@ FAILED:
   REQUIRE( Nttp_Fixture&lt;V>::value == 0 )
 with expansion:
   3 == 0
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6" time="{duration}" status="run">
@@ -289,7 +289,7 @@ FAILED:
   REQUIRE( Nttp_Fixture&lt;V>::value == 0 )
 with expansion:
   6 == 0
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Nttp_Fixture" name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1" time="{duration}" status="run"/>
@@ -301,7 +301,7 @@ FAILED:
   REQUIRE( m_a == 2 )
 with expansion:
   1 == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.Fixture" name="A TEST_CASE_METHOD based test run that succeeds" time="{duration}" status="run"/>
@@ -318,7 +318,7 @@ Class.tests.cpp:<line number>
       <failure type="FAIL">
 FAILED:
 to infinity and beyond
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="A couple of nested sections followed by a failure/Outer/Inner" time="{duration}" status="run"/>
@@ -328,14 +328,14 @@ FAILED:
   CHECK( &amp;o1 == &amp;o2 )
 with expansion:
   0x<hex digits> == 0x<hex digits>
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
       <failure message="o1 == o2" type="CHECK">
 FAILED:
   CHECK( o1 == o2 )
 with expansion:
   {?} == {?}
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Absolute margin" time="{duration}" status="run"/>
@@ -345,7 +345,7 @@ Tricky.tests.cpp:<line number>
 FAILED:
   {Unknown expression after the reported line}
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Anonymous test case 1" time="{duration}" status="run"/>
@@ -415,14 +415,14 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" contains: "not there" (case
   insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), ContainsSubstring( &quot;STRING&quot; )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( testStringForMatching(), ContainsSubstring( "STRING" ) )
 with expansion:
   "this string contains 'abc' as a substring" contains: "STRING"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Copy and then generate a range/from var and iterators" time="{duration}" status="run"/>
@@ -434,7 +434,7 @@ Matchers.tests.cpp:<line number>
 FAILED:
   REQUIRE_NOTHROW( throwCustom() )
 custom exception - not std
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Custom exceptions can be translated when testing for throwing as something else" time="{duration}" status="run">
@@ -442,14 +442,14 @@ Exception.tests.cpp:<line number>
 FAILED:
   REQUIRE_THROWS_AS( throwCustom(), std::exception )
 custom exception - not std
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Custom std-exceptions can be custom translated" time="{duration}" status="run">
       <error type="TEST_CASE">
 FAILED:
 custom std exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Default scale is invisible to comparison" time="{duration}" status="run"/>
@@ -462,7 +462,7 @@ FAILED:
   CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" ends with: "Substring"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), EndsWith( &quot;this&quot;, Catch::CaseSensitive::No )" type="CHECK_THAT">
 FAILED:
@@ -470,7 +470,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" ends with: "this" (case
   insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Enums can quickly have stringification enabled using REGISTER_ENUM" time="{duration}" status="run"/>
@@ -483,91 +483,91 @@ FAILED:
   CHECK( data.int_seven == 6 )
 with expansion:
   7 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven == 8" type="CHECK">
 FAILED:
   CHECK( data.int_seven == 8 )
 with expansion:
   7 == 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven == 0" type="CHECK">
 FAILED:
   CHECK( data.int_seven == 0 )
 with expansion:
   7 == 0
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one == Approx( 9.11f )" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.11f ) )
 with expansion:
   9.1f == Approx( 9.1099996567 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one == Approx( 9.0f )" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one == Approx( 9.0f ) )
 with expansion:
   9.1f == Approx( 9.0 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one == Approx( 1 )" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one == Approx( 1 ) )
 with expansion:
   9.1f == Approx( 1.0 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one == Approx( 0 )" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one == Approx( 0 ) )
 with expansion:
   9.1f == Approx( 0.0 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.double_pi == Approx( 3.1415 )" type="CHECK">
 FAILED:
   CHECK( data.double_pi == Approx( 3.1415 ) )
 with expansion:
   3.1415926535 == Approx( 3.1415 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello == &quot;goodbye&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello == "goodbye" )
 with expansion:
   "hello" == "goodbye"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello == &quot;hell&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello == "hell" )
 with expansion:
   "hello" == "hell"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello == &quot;hello1&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello == "hello1" )
 with expansion:
   "hello" == "hello1"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello.size() == 6" type="CHECK">
 FAILED:
   CHECK( data.str_hello.size() == 6 )
 with expansion:
   5 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="x == Approx( 1.301 )" type="CHECK">
 FAILED:
   CHECK( x == Approx( 1.301 ) )
 with expansion:
   1.3 == Approx( 1.301 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Equality checks that should succeed" time="{duration}" status="run"/>
@@ -579,7 +579,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" equals: "this string contains
   'ABC' as a substring"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), Equals( &quot;something else&quot;, Catch::CaseSensitive::No )" type="CHECK_THAT">
 FAILED:
@@ -587,7 +587,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" equals: "something else" (case
   insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified" time="{duration}" status="run"/>
@@ -595,12 +595,12 @@ Matchers.tests.cpp:<line number>
       <failure message="doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }" type="CHECK_THROWS_MATCHES">
 FAILED:
   CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }" type="REQUIRE_THROWS_MATCHES">
 FAILED:
   REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that fail/Type mismatch" time="{duration}" status="run">
@@ -608,13 +608,13 @@ Matchers.tests.cpp:<line number>
 FAILED:
   CHECK_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )
 Unknown exception
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </error>
       <error message="throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }" type="REQUIRE_THROWS_MATCHES">
 FAILED:
   REQUIRE_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )
 Unknown exception
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that fail/Contents are wrong" time="{duration}" status="run">
@@ -623,14 +623,14 @@ FAILED:
   CHECK_THROWS_MATCHES( throwsSpecialException( 3 ), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   SpecialException::what special exception has value of 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 }" type="REQUIRE_THROWS_MATCHES">
 FAILED:
   REQUIRE_THROWS_MATCHES( throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 } )
 with expansion:
   SpecialException::what special exception has value of 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Exception matchers that succeed" time="{duration}" status="run"/>
@@ -644,38 +644,38 @@ Matchers.tests.cpp:<line number>
 FAILED:
   CHECK_THROWS_AS( thisThrows(), std::string )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
       <failure message="thisDoesntThrow(), std::domain_error" type="CHECK_THROWS_AS">
 FAILED:
   CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </failure>
       <error message="thisThrows()" type="CHECK_NOTHROW">
 FAILED:
   CHECK_NOTHROW( thisThrows() )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL aborts the test" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL does not require an argument" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="FAIL_CHECK does not abort the test" time="{duration}" status="run">
       <failure type="FAIL_CHECK">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Factorials are computed" time="{duration}" status="run"/>
@@ -744,7 +744,7 @@ with expansion:
   2 == 1
 this message should be logged
 so should this
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}" status="run">
@@ -755,7 +755,7 @@ with expansion:
   2 == 1
 this message may be logged later
 this message should be logged
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
       <failure message="a == 0" type="CHECK">
 FAILED:
@@ -765,7 +765,7 @@ with expansion:
 this message may be logged later
 this message should be logged
 and this, but later
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="INFO is reset for each loop" time="{duration}" status="run">
@@ -776,7 +776,7 @@ with expansion:
   10 &lt; 10
 current counter 10
 i := 10
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should fail" time="{duration}" status="run">
@@ -786,35 +786,35 @@ FAILED:
   CHECK( data.int_seven != 7 )
 with expansion:
   7 != 7
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one != Approx( 9.1f )" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one != Approx( 9.1f ) )
 with expansion:
   9.1f != Approx( 9.1000003815 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.double_pi != Approx( 3.1415926535 )" type="CHECK">
 FAILED:
   CHECK( data.double_pi != Approx( 3.1415926535 ) )
 with expansion:
   3.1415926535 != Approx( 3.1415926535 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello != &quot;hello&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello != "hello" )
 with expansion:
   "hello" != "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello.size() != 5" type="CHECK">
 FAILED:
   CHECK( data.str_hello.size() != 5 )
 with expansion:
   5 != 5
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Inequality checks that should succeed" time="{duration}" status="run"/>
@@ -831,7 +831,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" ( ( contains: "string" or
   contains: "different" ) and contains: "random" )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Matchers can be negated (Not) with the ! operator" time="{duration}" status="run"/>
@@ -841,35 +841,35 @@ FAILED:
   CHECK_THAT( testStringForMatching(), !ContainsSubstring( "substring" ) )
 with expansion:
   "this string contains 'abc' as a substring" not contains: "substring"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mayfail test case with nested sections/1/A" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mayfail test case with nested sections/2/A" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mayfail test case with nested sections/1/B" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mayfail test case with nested sections/2/B" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Mismatching exception messages failing the test" time="{duration}" status="run">
@@ -878,7 +878,7 @@ FAILED:
   REQUIRE_THROWS_WITH( thisThrows(), "should fail" )
 with expansion:
   "expected exception" equals: "should fail"
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Multireporter calls reporters and listeners in correct order" time="{duration}" status="run"/>
@@ -891,7 +891,7 @@ Exception.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 custom exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Objects that evaluated in boolean contexts can be checked" time="{duration}" status="run"/>
@@ -902,133 +902,133 @@ FAILED:
   CHECK( data.int_seven > 7 )
 with expansion:
   7 > 7
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven &lt; 7" type="CHECK">
 FAILED:
   CHECK( data.int_seven &lt; 7 )
 with expansion:
   7 &lt; 7
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven > 8" type="CHECK">
 FAILED:
   CHECK( data.int_seven > 8 )
 with expansion:
   7 > 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven &lt; 6" type="CHECK">
 FAILED:
   CHECK( data.int_seven &lt; 6 )
 with expansion:
   7 &lt; 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven &lt; 0" type="CHECK">
 FAILED:
   CHECK( data.int_seven &lt; 0 )
 with expansion:
   7 &lt; 0
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven &lt; -1" type="CHECK">
 FAILED:
   CHECK( data.int_seven &lt; -1 )
 with expansion:
   7 &lt; -1
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven >= 8" type="CHECK">
 FAILED:
   CHECK( data.int_seven >= 8 )
 with expansion:
   7 >= 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.int_seven &lt;= 6" type="CHECK">
 FAILED:
   CHECK( data.int_seven &lt;= 6 )
 with expansion:
   7 &lt;= 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one &lt; 9" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one &lt; 9 )
 with expansion:
   9.1f &lt; 9
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one > 10" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one > 10 )
 with expansion:
   9.1f > 10
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.float_nine_point_one > 9.2" type="CHECK">
 FAILED:
   CHECK( data.float_nine_point_one > 9.2 )
 with expansion:
   9.1f > 9.2
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello > &quot;hello&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello > "hello" )
 with expansion:
   "hello" > "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello &lt; &quot;hello&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt; "hello" )
 with expansion:
   "hello" &lt; "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello > &quot;hellp&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello > "hellp" )
 with expansion:
   "hello" > "hellp"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello > &quot;z&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello > "z" )
 with expansion:
   "hello" > "z"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="data.str_hello &lt; &quot;hellm&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt; "hellm" )
 with expansion:
   "hello" &lt; "hellm"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>