From ac93f1943762f6fc92f0dc5bac0d720a33a27530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Sat, 31 Dec 2022 21:17:54 +0100
Subject: [PATCH] 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.
---
 .../SelfTest/Baselines/junit.sw.approved.txt  | 310 +++++++++---------
 .../Baselines/junit.sw.multi.approved.txt     | 310 +++++++++---------
 .../Baselines/sonarqube.sw.approved.txt       | 310 +++++++++---------
 .../Baselines/sonarqube.sw.multi.approved.txt | 310 +++++++++---------
 .../Baselines/teamcity.sw.approved.txt        | 310 +++++++++---------
 .../Baselines/teamcity.sw.multi.approved.txt  | 310 +++++++++---------
 tools/scripts/approvalTests.py                |  23 +-
 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>
       <failure message="data.str_hello &lt; &quot;a&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt; "a" )
 with expansion:
   "hello" &lt; "a"
-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;a&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt;= "a" )
 with expansion:
   "hello" &lt;= "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Ordering comparison checks that should succeed" time="{duration}" status="run"/>
@@ -1038,14 +1038,14 @@ Condition.tests.cpp:<line number>
       <failure type="FAIL">
 FAILED:
 Message from section one
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Output from all sections is reported/two" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
 Message from section two
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Overloaded comma or address-of operators are not used" time="{duration}" status="run"/>
@@ -1114,7 +1114,7 @@ FAILED:
   CHECK( truthy(false) )
 with expansion:
   Hey, its truthy!
-Decomposition.tests.cpp:<line number>
+at Decomposition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Regex string matcher" time="{duration}" status="run">
@@ -1124,7 +1124,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "this STRING contains
   'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), Matches( &quot;contains 'abc' as a substring&quot; )" type="CHECK_THAT">
 FAILED:
@@ -1132,7 +1132,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "contains 'abc' as a
   substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), Matches( &quot;this string contains 'abc' as a&quot; )" type="CHECK_THAT">
 FAILED:
@@ -1140,7 +1140,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "this string contains
   'abc' as a" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Registering reporter with '::' in name fails" time="{duration}" status="run"/>
@@ -1204,7 +1204,7 @@ FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "This String"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), StartsWith( &quot;string&quot;, Catch::CaseSensitive::No )" type="CHECK_THAT">
 FAILED:
@@ -1212,7 +1212,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string" (case
   insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Static arrays are convertible to string/Single item" time="{duration}" status="run"/>
@@ -1260,7 +1260,7 @@ with expansion:
   	$a = 20;
   }
   "
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" time="{duration}" status="run"/>
@@ -1333,14 +1333,14 @@ Misc.tests.cpp:<line number>
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Testing checked-if 3" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}" status="run"/>
@@ -1353,7 +1353,7 @@ Misc.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 For some reason someone is throwing a string literal!
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Tracker" time="{duration}" status="run"/>
@@ -1371,7 +1371,7 @@ Exception.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 3.14
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Upcasting special member functions/Move constructor" time="{duration}" status="run"/>
@@ -1430,7 +1430,7 @@ FAILED:
   CHECK_THAT( empty, Approx( t1 ) )
 with expansion:
   {  } is approx: { 1.0, 2.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector Approx matcher -- failing/Just different vectors" time="{duration}" status="run">
@@ -1439,7 +1439,7 @@ FAILED:
   CHECK_THAT( v1, Approx( v2 ) )
 with expansion:
   { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers/Contains (element)" time="{duration}" status="run"/>
@@ -1453,14 +1453,14 @@ FAILED:
   CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
   { 1, 2, 3 } Contains: -1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, VectorContains( 1 )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
   {  } Contains: 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Contains (vector)" time="{duration}" status="run">
@@ -1469,14 +1469,14 @@ FAILED:
   CHECK_THAT( empty, Contains( v ) )
 with expansion:
   {  } Contains: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v, Contains( v2 )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2, 4 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Equals" time="{duration}" status="run">
@@ -1485,28 +1485,28 @@ FAILED:
   CHECK_THAT( v, Equals( v2 ) )
 with expansion:
   { 1, 2, 3 } Equals: { 1, 2 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v2, Equals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v2, Equals( v ) )
 with expansion:
   { 1, 2 } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, Equals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, Equals( v ) )
 with expansion:
   {  } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v, Equals( empty )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v, Equals( empty ) )
 with expansion:
   { 1, 2, 3 } Equals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/UnorderedEquals" time="{duration}" status="run">
@@ -1515,28 +1515,28 @@ FAILED:
   CHECK_THAT( v, UnorderedEquals( empty ) )
 with expansion:
   { 1, 2, 3 } UnorderedEquals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, UnorderedEquals( v ) )
 with expansion:
   {  } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="permuted, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
   { 1, 3 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="permuted, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
   { 3, 1 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}" status="run"/>
@@ -1544,7 +1544,7 @@ Matchers.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a CHECK the test should continue" time="{duration}" status="run">
@@ -1552,7 +1552,7 @@ Exception.tests.cpp:<line number>
 FAILED:
   CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" time="{duration}" status="run">
@@ -1560,7 +1560,7 @@ Exception.tests.cpp:<line number>
 FAILED:
   REQUIRE( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}" status="run">
@@ -1568,14 +1568,14 @@ Exception.tests.cpp:<line number>
 FAILED:
   CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from sections they are always failures/section name" time="{duration}" status="run">
       <error type="TEST_CASE">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="X/level/0/a" time="{duration}" status="run"/>
@@ -1603,7 +1603,7 @@ FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="checkedIf" time="{duration}" status="run"/>
@@ -1613,7 +1613,7 @@ FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="classify_outliers/none" time="{duration}" status="run"/>
@@ -1636,14 +1636,14 @@ Misc.tests.cpp:<line number>
       <failure type="FAIL">
 FAILED:
 Previous info should not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="just failure after unscoped info" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
 previous unscoped info SHOULD not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="long long" time="{duration}" status="run"/>
@@ -1653,7 +1653,7 @@ FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="looped SECTION tests/b is currently: 1" time="{duration}" status="run">
@@ -1662,7 +1662,7 @@ FAILED:
   CHECK( b > a )
 with expansion:
   1 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="looped SECTION tests/b is currently: 2" time="{duration}" status="run"/>
@@ -1680,7 +1680,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[0] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1688,7 +1688,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[1] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1696,7 +1696,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[3] (3) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1704,7 +1704,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[4] (5) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1712,7 +1712,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[6] (13) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1720,7 +1720,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[7] (21) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="makeStream recognizes %debug stream name" time="{duration}" status="run"/>
@@ -1736,7 +1736,7 @@ FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="more nested SECTION tests/doesn't equal/not equal" time="{duration}" status="run"/>
@@ -1753,7 +1753,7 @@ Misc.tests.cpp:<line number>
 FAILED:
   REQUIRE( false )
 this SHOULD be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="null strings" time="{duration}" status="run"/>
@@ -1770,7 +1770,7 @@ FAILED:
   REQUIRE( false )
 this SHOULD be seen
 this SHOULD also be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="prints unscoped info only for the first assertion" time="{duration}" status="run">
@@ -1778,7 +1778,7 @@ Message.tests.cpp:<line number>
 FAILED:
   CHECK( false )
 this SHOULD be seen only ONCE
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="random SECTION tests/doesn't equal" time="{duration}" status="run"/>
@@ -1799,7 +1799,7 @@ Message.tests.cpp:<line number>
 FAILED:
   REQUIRE( false )
 3
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="sends information to INFO" time="{duration}" status="run">
@@ -1808,7 +1808,7 @@ FAILED:
   REQUIRE( false )
 hi
 i := 7
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="shortened hide tags are split apart" time="{duration}" status="run"/>
@@ -1821,7 +1821,7 @@ Count 1 to 3...
 1
 2
 3
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
 FAILED:
@@ -1830,7 +1830,7 @@ Count 4 to 6...
 4
 5
 6
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="startsWith" time="{duration}" status="run"/>
@@ -1860,7 +1860,7 @@ Message.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 Why would you throw a std::string?
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="toString on const wchar_t const pointer returns the string contents" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
index cde93ecf..6bacb088 100644
--- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -18,7 +18,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
@@ -53,7 +53,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">
@@ -63,7 +63,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"/>
@@ -76,7 +76,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"/>
@@ -89,52 +89,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"/>
@@ -150,7 +150,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"/>
@@ -160,7 +160,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">
@@ -169,7 +169,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">
@@ -178,7 +178,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">
@@ -187,7 +187,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"/>
@@ -200,7 +200,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">
@@ -209,7 +209,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">
@@ -218,7 +218,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">
@@ -227,7 +227,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"/>
@@ -240,7 +240,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">
@@ -249,7 +249,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">
@@ -258,7 +258,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"/>
@@ -270,7 +270,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">
@@ -279,7 +279,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">
@@ -288,7 +288,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"/>
@@ -300,7 +300,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"/>
@@ -317,7 +317,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"/>
@@ -327,14 +327,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"/>
@@ -344,7 +344,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"/>
@@ -414,14 +414,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"/>
@@ -433,7 +433,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">
@@ -441,14 +441,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"/>
@@ -461,7 +461,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:
@@ -469,7 +469,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"/>
@@ -482,91 +482,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"/>
@@ -578,7 +578,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:
@@ -586,7 +586,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"/>
@@ -594,12 +594,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">
@@ -607,13 +607,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">
@@ -622,14 +622,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"/>
@@ -643,38 +643,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"/>
@@ -743,7 +743,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">
@@ -754,7 +754,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:
@@ -764,7 +764,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">
@@ -775,7 +775,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">
@@ -785,35 +785,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"/>
@@ -830,7 +830,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"/>
@@ -840,35 +840,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">
@@ -877,7 +877,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"/>
@@ -890,7 +890,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"/>
@@ -901,133 +901,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>
       <failure message="data.str_hello &lt; &quot;a&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt; "a" )
 with expansion:
   "hello" &lt; "a"
-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;a&quot;" type="CHECK">
 FAILED:
   CHECK( data.str_hello &lt;= "a" )
 with expansion:
   "hello" &lt;= "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Ordering comparison checks that should succeed" time="{duration}" status="run"/>
@@ -1037,14 +1037,14 @@ Condition.tests.cpp:<line number>
       <failure type="FAIL">
 FAILED:
 Message from section one
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Output from all sections is reported/two" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
 Message from section two
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Overloaded comma or address-of operators are not used" time="{duration}" status="run"/>
@@ -1113,7 +1113,7 @@ FAILED:
   CHECK( truthy(false) )
 with expansion:
   Hey, its truthy!
-Decomposition.tests.cpp:<line number>
+at Decomposition.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Regex string matcher" time="{duration}" status="run">
@@ -1123,7 +1123,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "this STRING contains
   'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), Matches( &quot;contains 'abc' as a substring&quot; )" type="CHECK_THAT">
 FAILED:
@@ -1131,7 +1131,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "contains 'abc' as a
   substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), Matches( &quot;this string contains 'abc' as a&quot; )" type="CHECK_THAT">
 FAILED:
@@ -1139,7 +1139,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" matches "this string contains
   'abc' as a" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Registering reporter with '::' in name fails" time="{duration}" status="run"/>
@@ -1203,7 +1203,7 @@ FAILED:
   CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
   "this string contains 'abc' as a substring" starts with: "This String"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="testStringForMatching(), StartsWith( &quot;string&quot;, Catch::CaseSensitive::No )" type="CHECK_THAT">
 FAILED:
@@ -1211,7 +1211,7 @@ FAILED:
 with expansion:
   "this string contains 'abc' as a substring" starts with: "string" (case
   insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Static arrays are convertible to string/Single item" time="{duration}" status="run"/>
@@ -1259,7 +1259,7 @@ with expansion:
   	$a = 20;
   }
   "
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Tag alias can be registered against tag patterns/The same tag alias can only be registered once" time="{duration}" status="run"/>
@@ -1332,14 +1332,14 @@ Misc.tests.cpp:<line number>
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Testing checked-if 3" time="{duration}" status="run">
       <skipped message="TEST_CASE tagged with !mayfail"/>
       <failure type="FAIL">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="The NO_FAIL macro reports a failure but does not fail the test" time="{duration}" status="run"/>
@@ -1352,7 +1352,7 @@ Misc.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 For some reason someone is throwing a string literal!
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Tracker" time="{duration}" status="run"/>
@@ -1370,7 +1370,7 @@ Exception.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 3.14
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="Upcasting special member functions/Move constructor" time="{duration}" status="run"/>
@@ -1429,7 +1429,7 @@ FAILED:
   CHECK_THAT( empty, Approx( t1 ) )
 with expansion:
   {  } is approx: { 1.0, 2.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector Approx matcher -- failing/Just different vectors" time="{duration}" status="run">
@@ -1438,7 +1438,7 @@ FAILED:
   CHECK_THAT( v1, Approx( v2 ) )
 with expansion:
   { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers/Contains (element)" time="{duration}" status="run"/>
@@ -1452,14 +1452,14 @@ FAILED:
   CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
   { 1, 2, 3 } Contains: -1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, VectorContains( 1 )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
   {  } Contains: 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Contains (vector)" time="{duration}" status="run">
@@ -1468,14 +1468,14 @@ FAILED:
   CHECK_THAT( empty, Contains( v ) )
 with expansion:
   {  } Contains: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v, Contains( v2 )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v, Contains( v2 ) )
 with expansion:
   { 1, 2, 3 } Contains: { 1, 2, 4 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/Equals" time="{duration}" status="run">
@@ -1484,28 +1484,28 @@ FAILED:
   CHECK_THAT( v, Equals( v2 ) )
 with expansion:
   { 1, 2, 3 } Equals: { 1, 2 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v2, Equals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v2, Equals( v ) )
 with expansion:
   { 1, 2 } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, Equals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, Equals( v ) )
 with expansion:
   {  } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="v, Equals( empty )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( v, Equals( empty ) )
 with expansion:
   { 1, 2, 3 } Equals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="Vector matchers that fail/UnorderedEquals" time="{duration}" status="run">
@@ -1514,28 +1514,28 @@ FAILED:
   CHECK_THAT( v, UnorderedEquals( empty ) )
 with expansion:
   { 1, 2, 3 } UnorderedEquals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="empty, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( empty, UnorderedEquals( v ) )
 with expansion:
   {  } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="permuted, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
   { 1, 3 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="permuted, UnorderedEquals( v )" type="CHECK_THAT">
 FAILED:
   CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
   { 3, 1 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="When checked exceptions are thrown they can be expected or unexpected" time="{duration}" status="run"/>
@@ -1543,7 +1543,7 @@ Matchers.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a CHECK the test should continue" time="{duration}" status="run">
@@ -1551,7 +1551,7 @@ Exception.tests.cpp:<line number>
 FAILED:
   CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" time="{duration}" status="run">
@@ -1559,7 +1559,7 @@ Exception.tests.cpp:<line number>
 FAILED:
   REQUIRE( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from functions they are always failures" time="{duration}" status="run">
@@ -1567,14 +1567,14 @@ Exception.tests.cpp:<line number>
 FAILED:
   CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="When unchecked exceptions are thrown from sections they are always failures/section name" time="{duration}" status="run">
       <error type="TEST_CASE">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="X/level/0/a" time="{duration}" status="run"/>
@@ -1602,7 +1602,7 @@ FAILED:
   REQUIRE( testCheckedElse( false ) )
 with expansion:
   false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="checkedIf" time="{duration}" status="run"/>
@@ -1612,7 +1612,7 @@ FAILED:
   REQUIRE( testCheckedIf( false ) )
 with expansion:
   false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="classify_outliers/none" time="{duration}" status="run"/>
@@ -1635,14 +1635,14 @@ Misc.tests.cpp:<line number>
       <failure type="FAIL">
 FAILED:
 Previous info should not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="just failure after unscoped info" time="{duration}" status="run">
       <failure type="FAIL">
 FAILED:
 previous unscoped info SHOULD not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="long long" time="{duration}" status="run"/>
@@ -1652,7 +1652,7 @@ FAILED:
   CHECK( b > a )
 with expansion:
   0 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="looped SECTION tests/b is currently: 1" time="{duration}" status="run">
@@ -1661,7 +1661,7 @@ FAILED:
   CHECK( b > a )
 with expansion:
   1 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="looped SECTION tests/b is currently: 2" time="{duration}" status="run"/>
@@ -1679,7 +1679,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[0] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1687,7 +1687,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[1] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1695,7 +1695,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[3] (3) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1703,7 +1703,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[4] (5) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1711,7 +1711,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[6] (13) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="( fib[i] % 2 ) == 0" type="CHECK">
 FAILED:
@@ -1719,7 +1719,7 @@ FAILED:
 with expansion:
   1 == 0
 Testing if fib[7] (21) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="makeStream recognizes %debug stream name" time="{duration}" status="run"/>
@@ -1735,7 +1735,7 @@ FAILED:
   REQUIRE( a == b )
 with expansion:
   1 == 2
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="more nested SECTION tests/doesn't equal/not equal" time="{duration}" status="run"/>
@@ -1752,7 +1752,7 @@ Misc.tests.cpp:<line number>
 FAILED:
   REQUIRE( false )
 this SHOULD be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="null strings" time="{duration}" status="run"/>
@@ -1769,7 +1769,7 @@ FAILED:
   REQUIRE( false )
 this SHOULD be seen
 this SHOULD also be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="prints unscoped info only for the first assertion" time="{duration}" status="run">
@@ -1777,7 +1777,7 @@ Message.tests.cpp:<line number>
 FAILED:
   CHECK( false )
 this SHOULD be seen only ONCE
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="random SECTION tests/doesn't equal" time="{duration}" status="run"/>
@@ -1798,7 +1798,7 @@ Message.tests.cpp:<line number>
 FAILED:
   REQUIRE( false )
 3
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="sends information to INFO" time="{duration}" status="run">
@@ -1807,7 +1807,7 @@ FAILED:
   REQUIRE( false )
 hi
 i := 7
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="shortened hide tags are split apart" time="{duration}" status="run"/>
@@ -1820,7 +1820,7 @@ Count 1 to 3...
 1
 2
 3
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
       <failure message="false" type="CHECK">
 FAILED:
@@ -1829,7 +1829,7 @@ Count 4 to 6...
 4
 5
 6
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testcase>
     <testcase classname="<exe-name>.global" name="startsWith" time="{duration}" status="run"/>
@@ -1859,7 +1859,7 @@ Message.tests.cpp:<line number>
       <error type="TEST_CASE">
 FAILED:
 Why would you throw a std::string?
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testcase>
     <testcase classname="<exe-name>.global" name="toString on const wchar_t const pointer returns the string contents" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index e778d549..16462bf8 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -330,7 +330,7 @@ FAILED:
 	REQUIRE( s == "world" )
 with expansion:
 	"hello" == "world"
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A METHOD_AS_TEST_CASE based test run that succeeds" duration="{duration}"/>
@@ -340,7 +340,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo&lt;int>" duration="{duration}">
@@ -349,7 +349,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;float>" duration="{duration}">
@@ -358,7 +358,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;int>" duration="{duration}">
@@ -367,7 +367,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo&lt;float>" duration="{duration}"/>
@@ -380,7 +380,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;int, 2>" duration="{duration}">
@@ -389,7 +389,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;float, 6>" duration="{duration}">
@@ -398,7 +398,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;int, 2>" duration="{duration}">
@@ -407,7 +407,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2&lt;float,6>" duration="{duration}"/>
@@ -420,7 +420,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - float" duration="{duration}">
@@ -429,7 +429,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - int" duration="{duration}">
@@ -438,7 +438,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double" duration="{duration}"/>
@@ -450,7 +450,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3" duration="{duration}">
@@ -459,7 +459,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6" duration="{duration}">
@@ -468,7 +468,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1" duration="{duration}"/>
@@ -480,7 +480,7 @@ FAILED:
 	REQUIRE( m_a == 2 )
 with expansion:
 	1 == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A TEST_CASE_METHOD based test run that succeeds" duration="{duration}"/>
@@ -508,52 +508,52 @@ Class.tests.cpp:<line number>
       <failure message="CHECK(false != false)">
 FAILED:
 	CHECK( false != false )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(true != true)">
 FAILED:
 	CHECK( true != true )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!true)">
 FAILED:
 	CHECK( !true )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(true))">
 FAILED:
 	CHECK_FALSE( true )
 with expansion:
 	!true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!trueValue)">
 FAILED:
 	CHECK( !trueValue )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(trueValue))">
 FAILED:
 	CHECK_FALSE( trueValue )
 with expansion:
 	!true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!(1 == 1))">
 FAILED:
 	CHECK( !(1 == 1) )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(1 == 1))">
 FAILED:
 	CHECK_FALSE( 1 == 1 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="'Not' checks that should succeed" duration="{duration}"/>
@@ -566,91 +566,91 @@ FAILED:
 	CHECK( data.int_seven == 6 )
 with expansion:
 	7 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.int_seven == 8)">
 FAILED:
 	CHECK( data.int_seven == 8 )
 with expansion:
 	7 == 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.int_seven == 0)">
 FAILED:
 	CHECK( data.int_seven == 0 )
 with expansion:
 	7 == 0
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 9.11f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 9.0f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 1 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 0 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.double_pi == Approx( 3.1415 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;goodbye&quot;)">
 FAILED:
 	CHECK( data.str_hello == "goodbye" )
 with expansion:
 	"hello" == "goodbye"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;hell&quot;)">
 FAILED:
 	CHECK( data.str_hello == "hell" )
 with expansion:
 	"hello" == "hell"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;hello1&quot;)">
 FAILED:
 	CHECK( data.str_hello == "hello1" )
 with expansion:
 	"hello" == "hello1"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello.size() == 6)">
 FAILED:
 	CHECK( data.str_hello.size() == 6 )
 with expansion:
 	5 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(x == Approx( 1.301 ))">
 FAILED:
 	CHECK( x == Approx( 1.301 ) )
 with expansion:
 	1.3 == Approx( 1.301 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Equality checks that should succeed" duration="{duration}"/>
@@ -660,60 +660,60 @@ FAILED:
 	CHECK( data.int_seven != 7 )
 with expansion:
 	7 != 7
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one != Approx( 9.1f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.double_pi != Approx( 3.1415926535 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.str_hello != &quot;hello&quot;)">
 FAILED:
 	CHECK( data.str_hello != "hello" )
 with expansion:
 	"hello" != "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello.size() != 5)">
 FAILED:
 	CHECK( data.str_hello.size() != 5 )
 with expansion:
 	5 != 5
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Inequality checks that should succeed" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/1/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/2/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/1/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/2/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Ordering comparison checks that should fail" duration="{duration}">
@@ -722,133 +722,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="CHECK(data.int_seven &lt; 7)">
 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="CHECK(data.int_seven > 8)">
 FAILED:
 	CHECK( data.int_seven > 8 )
 with expansion:
 	7 > 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.int_seven &lt; 6)">
 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="CHECK(data.int_seven &lt; 0)">
 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="CHECK(data.int_seven &lt; -1)">
 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="CHECK(data.int_seven >= 8)">
 FAILED:
 	CHECK( data.int_seven >= 8 )
 with expansion:
 	7 >= 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.int_seven &lt;= 6)">
 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="CHECK(data.float_nine_point_one &lt; 9)">
 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="CHECK(data.float_nine_point_one > 10)">
 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="CHECK(data.float_nine_point_one > 9.2)">
 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="CHECK(data.str_hello > &quot;hello&quot;)">
 FAILED:
 	CHECK( data.str_hello > "hello" )
 with expansion:
 	"hello" > "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;hello&quot;)">
 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="CHECK(data.str_hello > &quot;hellp&quot;)">
 FAILED:
 	CHECK( data.str_hello > "hellp" )
 with expansion:
 	"hello" > "hellp"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello > &quot;z&quot;)">
 FAILED:
 	CHECK( data.str_hello > "z" )
 with expansion:
 	"hello" > "z"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;hellm&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt; "hellm" )
 with expansion:
 	"hello" &lt; "hellm"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;a&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt; "a" )
 with expansion:
 	"hello" &lt; "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello >= &quot;z&quot;)">
 FAILED:
 	CHECK( data.str_hello >= "z" )
 with expansion:
 	"hello" >= "z"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt;= &quot;a&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt;= "a" )
 with expansion:
 	"hello" &lt;= "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Ordering comparison checks that should succeed" duration="{duration}"/>
@@ -863,7 +863,7 @@ FAILED:
 	CHECK( truthy(false) )
 with expansion:
 	Hey, its truthy!
-Decomposition.tests.cpp:<line number>
+at Decomposition.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -881,7 +881,7 @@ Decomposition.tests.cpp:<line number>
 FAILED:
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#748 - captures with unexpected exceptions/inside REQUIRE_NOTHROW" duration="{duration}">
@@ -890,7 +890,7 @@ FAILED:
 	REQUIRE_NOTHROW( thisThrows() )
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" duration="{duration}"/>
@@ -899,7 +899,7 @@ Exception.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 name="Custom exceptions can be translated when testing for nothrow" duration="{duration}">
@@ -907,7 +907,7 @@ Exception.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 name="Custom exceptions can be translated when testing for throwing as something else" duration="{duration}">
@@ -915,14 +915,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 name="Custom std-exceptions can be custom translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 custom std exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Exception messages can be tested for/exact match" duration="{duration}"/>
@@ -933,18 +933,18 @@ Exception.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="CHECK_THROWS_AS(thisDoesntThrow(), std::domain_error)">
 FAILED:
 	CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </failure>
       <error message="CHECK_NOTHROW(thisThrows())">
 FAILED:
 	CHECK_NOTHROW( thisThrows() )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Mismatching exception messages failing the test" duration="{duration}">
@@ -953,28 +953,28 @@ 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 name="Non-std exceptions can be translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 custom exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Thrown string literals are translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 For some reason someone is throwing a string literal!
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Unexpected exceptions can be translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 3.14
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When checked exceptions are thrown they can be expected or unexpected" duration="{duration}"/>
@@ -982,7 +982,7 @@ Exception.tests.cpp:<line number>
       <error message="TEST_CASE()">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown during a CHECK the test should continue" duration="{duration}">
@@ -990,7 +990,7 @@ Exception.tests.cpp:<line number>
 FAILED:
 	CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" duration="{duration}">
@@ -998,7 +998,7 @@ Exception.tests.cpp:<line number>
 FAILED:
 	REQUIRE( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown from functions they are always failures" duration="{duration}">
@@ -1006,21 +1006,21 @@ Exception.tests.cpp:<line number>
 FAILED:
 	CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown from sections they are always failures/section name" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="thrown std::strings are translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 Why would you throw a std::string?
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
   </file>
@@ -1070,14 +1070,14 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )
 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="CHECK_THAT(testStringForMatching(), ContainsSubstring( &quot;STRING&quot; ))">
 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 name="EndsWith string matcher" duration="{duration}">
@@ -1086,14 +1086,14 @@ 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="CHECK_THAT(testStringForMatching(), EndsWith( &quot;this&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )
 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 name="Equals" duration="{duration}"/>
@@ -1103,26 +1103,26 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), Equals( "this string contains 'ABC' as a substring" ) )
 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="CHECK_THAT(testStringForMatching(), Equals( &quot;something else&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )
 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 name="Exception matchers that fail/No exception" duration="{duration}">
       <failure message="CHECK_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 })">
 FAILED:
 	CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="REQUIRE_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 })">
 FAILED:
 	REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Exception matchers that fail/Type mismatch" duration="{duration}">
@@ -1130,13 +1130,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="REQUIRE_THROWS_MATCHES(throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 })">
 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 name="Exception matchers that fail/Contents are wrong" duration="{duration}">
@@ -1145,14 +1145,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="REQUIRE_THROWS_MATCHES(throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 })">
 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 name="Exception matchers that succeed" duration="{duration}"/>
@@ -1179,7 +1179,7 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) || ContainsSubstring( "different" ) ) &amp;&amp; ContainsSubstring( "random" ) )
 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 name="Matchers can be negated (Not) with the ! operator" duration="{duration}"/>
@@ -1189,7 +1189,7 @@ 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 name="Overloaded comma or address-of operators are not used" duration="{duration}"/>
@@ -1200,21 +1200,21 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "this STRING contains 'abc' as a substring" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "this STRING contains 'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), Matches( &quot;contains 'abc' as a substring&quot; ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "contains 'abc' as a substring" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "contains 'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), Matches( &quot;this string contains 'abc' as a&quot; ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "this string contains 'abc' as a" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "this string contains 'abc' as a" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Regression test #1" duration="{duration}"/>
@@ -1224,14 +1224,14 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
 	"this string contains 'abc' as a substring" starts with: "This String"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), StartsWith( &quot;string&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )
 with expansion:
 	"this string contains 'abc' as a substring" starts with: "string" (case insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="String matchers" duration="{duration}"/>
@@ -1245,7 +1245,7 @@ FAILED:
 	CHECK_THAT( empty, Approx( t1 ) )
 with expansion:
 	{  } is approx: { 1.0, 2.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector Approx matcher -- failing/Just different vectors" duration="{duration}">
@@ -1254,7 +1254,7 @@ FAILED:
 	CHECK_THAT( v1, Approx( v2 ) )
 with expansion:
 	{ 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers/Contains (element)" duration="{duration}"/>
@@ -1268,14 +1268,14 @@ FAILED:
 	CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
 	{ 1, 2, 3 } Contains: -1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, VectorContains( 1 ))">
 FAILED:
 	CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
 	{  } Contains: 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/Contains (vector)" duration="{duration}">
@@ -1284,14 +1284,14 @@ FAILED:
 	CHECK_THAT( empty, Contains( v ) )
 with expansion:
 	{  } Contains: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v, Contains( v2 ))">
 FAILED:
 	CHECK_THAT( v, Contains( v2 ) )
 with expansion:
 	{ 1, 2, 3 } Contains: { 1, 2, 4 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/Equals" duration="{duration}">
@@ -1300,28 +1300,28 @@ FAILED:
 	CHECK_THAT( v, Equals( v2 ) )
 with expansion:
 	{ 1, 2, 3 } Equals: { 1, 2 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v2, Equals( v ))">
 FAILED:
 	CHECK_THAT( v2, Equals( v ) )
 with expansion:
 	{ 1, 2 } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, Equals( v ))">
 FAILED:
 	CHECK_THAT( empty, Equals( v ) )
 with expansion:
 	{  } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v, Equals( empty ))">
 FAILED:
 	CHECK_THAT( v, Equals( empty ) )
 with expansion:
 	{ 1, 2, 3 } Equals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/UnorderedEquals" duration="{duration}">
@@ -1330,28 +1330,28 @@ FAILED:
 	CHECK_THAT( v, UnorderedEquals( empty ) )
 with expansion:
 	{ 1, 2, 3 } UnorderedEquals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( empty, UnorderedEquals( v ) )
 with expansion:
 	{  } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(permuted, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
 	{ 1, 3 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(permuted, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
 	{ 3, 1 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -1417,20 +1417,20 @@ Matchers.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="FAIL does not require an argument" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="FAIL_CHECK does not abort the test" duration="{duration}">
       <failure message="FAIL_CHECK()">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="INFO and WARN do not abort tests" duration="{duration}"/>
@@ -1442,7 +1442,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 name="INFO gets logged on failure, even if captured before successful assertions" duration="{duration}">
@@ -1453,7 +1453,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="CHECK(a == 0)">
 FAILED:
@@ -1463,7 +1463,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 name="INFO is reset for each loop" duration="{duration}">
@@ -1474,21 +1474,21 @@ with expansion:
 	10 &lt; 10
 current counter 10
 i := 10
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Output from all sections is reported/one" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 Message from section one
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Output from all sections is reported/two" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 Message from section two
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="SUCCEED counts as a test pass" duration="{duration}"/>
@@ -1499,14 +1499,14 @@ Message.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 Previous info should not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="just failure after unscoped info" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 previous unscoped info SHOULD not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="mix info, unscoped info and warning" duration="{duration}"/>
@@ -1515,7 +1515,7 @@ Message.tests.cpp:<line number>
 FAILED:
 	REQUIRE( false )
 this SHOULD be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="print unscoped info if passing unscoped info is printed" duration="{duration}"/>
@@ -1525,7 +1525,7 @@ FAILED:
 	REQUIRE( false )
 this SHOULD be seen
 this SHOULD also be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="prints unscoped info only for the first assertion" duration="{duration}">
@@ -1533,7 +1533,7 @@ Message.tests.cpp:<line number>
 FAILED:
 	CHECK( false )
 this SHOULD be seen only ONCE
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="sends information to INFO" duration="{duration}">
@@ -1542,7 +1542,7 @@ FAILED:
 	REQUIRE( false )
 hi
 i := 7
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="stacks unscoped info in loops" duration="{duration}">
@@ -1553,7 +1553,7 @@ Count 1 to 3...
 1
 2
 3
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(false)">
 FAILED:
@@ -1562,7 +1562,7 @@ Count 4 to 6...
 4
 5
 6
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -1578,7 +1578,7 @@ FAILED:
 	CHECK( f() == 0 )
 with expansion:
 	1 == 0
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#961 -- Dynamically created sections should all be reported/Looped section 0" duration="{duration}"/>
@@ -1598,7 +1598,7 @@ Misc.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 to infinity and beyond
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A couple of nested sections followed by a failure/Outer/Inner" duration="{duration}"/>
@@ -1622,7 +1622,7 @@ with expansion:
 	$a = 20;
 }
 "
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" duration="{duration}"/>
@@ -1684,13 +1684,13 @@ Misc.tests.cpp:<line number>
     <testCase name="Testing checked-if 2" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Testing checked-if 3" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="This test 'should' fail but doesn't" duration="{duration}"/>
@@ -1701,7 +1701,7 @@ FAILED:
 	REQUIRE( testCheckedElse( false ) )
 with expansion:
 	false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="checkedIf" duration="{duration}"/>
@@ -1711,7 +1711,7 @@ FAILED:
 	REQUIRE( testCheckedIf( false ) )
 with expansion:
 	false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="even more nested SECTION tests/c/d (leaf)" duration="{duration}"/>
@@ -1724,7 +1724,7 @@ FAILED:
 	CHECK( b > a )
 with expansion:
 	0 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="looped SECTION tests/b is currently: 1" duration="{duration}">
@@ -1733,7 +1733,7 @@ FAILED:
 	CHECK( b > a )
 with expansion:
 	1 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="looped SECTION tests/b is currently: 2" duration="{duration}"/>
@@ -1751,7 +1751,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[0] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1759,7 +1759,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[1] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1767,7 +1767,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[3] (3) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1775,7 +1775,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[4] (5) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1783,7 +1783,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[6] (13) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1791,7 +1791,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[7] (21) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="more nested SECTION tests/equal/doesn't equal" duration="{duration}">
@@ -1800,7 +1800,7 @@ FAILED:
 	REQUIRE( a == b )
 with expansion:
 	1 == 2
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="more nested SECTION tests/doesn't equal/not equal" duration="{duration}"/>
@@ -1816,7 +1816,7 @@ Misc.tests.cpp:<line number>
 FAILED:
 	REQUIRE( false )
 3
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="toString on const wchar_t const pointer returns the string contents" duration="{duration}"/>
@@ -1893,7 +1893,7 @@ Misc.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 1514
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="(unimplemented) static bools can be evaluated/compare to true" duration="{duration}"/>
@@ -1907,14 +1907,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="CHECK(o1 == o2)">
 FAILED:
 	CHECK( o1 == o2 )
 with expansion:
 	{?} == {?}
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="An expression with side-effects should only be evaluated once" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
index 47fab5b5..3f9489bc 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
@@ -329,7 +329,7 @@ FAILED:
 	REQUIRE( s == "world" )
 with expansion:
 	"hello" == "world"
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A METHOD_AS_TEST_CASE based test run that succeeds" duration="{duration}"/>
@@ -339,7 +339,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo&lt;int>" duration="{duration}">
@@ -348,7 +348,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;float>" duration="{duration}">
@@ -357,7 +357,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector&lt;int>" duration="{duration}">
@@ -366,7 +366,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo&lt;float>" duration="{duration}"/>
@@ -379,7 +379,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2&lt;int, 2>" duration="{duration}">
@@ -388,7 +388,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;float, 6>" duration="{duration}">
@@ -397,7 +397,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array&lt;int, 2>" duration="{duration}">
@@ -406,7 +406,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 name="A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2&lt;float,6>" duration="{duration}"/>
@@ -419,7 +419,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - float" duration="{duration}">
@@ -428,7 +428,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that fails - int" duration="{duration}">
@@ -437,7 +437,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 name="A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double" duration="{duration}"/>
@@ -449,7 +449,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3" duration="{duration}">
@@ -458,7 +458,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6" duration="{duration}">
@@ -467,7 +467,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 name="A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1" duration="{duration}"/>
@@ -479,7 +479,7 @@ FAILED:
 	REQUIRE( m_a == 2 )
 with expansion:
 	1 == 2
-Class.tests.cpp:<line number>
+at Class.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A TEST_CASE_METHOD based test run that succeeds" duration="{duration}"/>
@@ -507,52 +507,52 @@ Class.tests.cpp:<line number>
       <failure message="CHECK(false != false)">
 FAILED:
 	CHECK( false != false )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(true != true)">
 FAILED:
 	CHECK( true != true )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!true)">
 FAILED:
 	CHECK( !true )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(true))">
 FAILED:
 	CHECK_FALSE( true )
 with expansion:
 	!true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!trueValue)">
 FAILED:
 	CHECK( !trueValue )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(trueValue))">
 FAILED:
 	CHECK_FALSE( trueValue )
 with expansion:
 	!true
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(!(1 == 1))">
 FAILED:
 	CHECK( !(1 == 1) )
 with expansion:
 	false
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_FALSE(!(1 == 1))">
 FAILED:
 	CHECK_FALSE( 1 == 1 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="'Not' checks that should succeed" duration="{duration}"/>
@@ -565,91 +565,91 @@ FAILED:
 	CHECK( data.int_seven == 6 )
 with expansion:
 	7 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.int_seven == 8)">
 FAILED:
 	CHECK( data.int_seven == 8 )
 with expansion:
 	7 == 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.int_seven == 0)">
 FAILED:
 	CHECK( data.int_seven == 0 )
 with expansion:
 	7 == 0
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 9.11f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 9.0f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 1 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one == Approx( 0 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.double_pi == Approx( 3.1415 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;goodbye&quot;)">
 FAILED:
 	CHECK( data.str_hello == "goodbye" )
 with expansion:
 	"hello" == "goodbye"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;hell&quot;)">
 FAILED:
 	CHECK( data.str_hello == "hell" )
 with expansion:
 	"hello" == "hell"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello == &quot;hello1&quot;)">
 FAILED:
 	CHECK( data.str_hello == "hello1" )
 with expansion:
 	"hello" == "hello1"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello.size() == 6)">
 FAILED:
 	CHECK( data.str_hello.size() == 6 )
 with expansion:
 	5 == 6
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(x == Approx( 1.301 ))">
 FAILED:
 	CHECK( x == Approx( 1.301 ) )
 with expansion:
 	1.3 == Approx( 1.301 )
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Equality checks that should succeed" duration="{duration}"/>
@@ -659,60 +659,60 @@ FAILED:
 	CHECK( data.int_seven != 7 )
 with expansion:
 	7 != 7
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.float_nine_point_one != Approx( 9.1f ))">
 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>
       </skipped>
       <skipped message="CHECK(data.double_pi != Approx( 3.1415926535 ))">
 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>
       </skipped>
       <skipped message="CHECK(data.str_hello != &quot;hello&quot;)">
 FAILED:
 	CHECK( data.str_hello != "hello" )
 with expansion:
 	"hello" != "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
       <skipped message="CHECK(data.str_hello.size() != 5)">
 FAILED:
 	CHECK( data.str_hello.size() != 5 )
 with expansion:
 	5 != 5
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Inequality checks that should succeed" duration="{duration}"/>
     <testCase name="Mayfail test case with nested sections/1/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/2/A" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/1/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Mayfail test case with nested sections/2/B" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Ordering comparison checks that should fail" duration="{duration}">
@@ -721,133 +721,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="CHECK(data.int_seven &lt; 7)">
 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="CHECK(data.int_seven > 8)">
 FAILED:
 	CHECK( data.int_seven > 8 )
 with expansion:
 	7 > 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.int_seven &lt; 6)">
 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="CHECK(data.int_seven &lt; 0)">
 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="CHECK(data.int_seven &lt; -1)">
 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="CHECK(data.int_seven >= 8)">
 FAILED:
 	CHECK( data.int_seven >= 8 )
 with expansion:
 	7 >= 8
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.int_seven &lt;= 6)">
 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="CHECK(data.float_nine_point_one &lt; 9)">
 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="CHECK(data.float_nine_point_one > 10)">
 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="CHECK(data.float_nine_point_one > 9.2)">
 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="CHECK(data.str_hello > &quot;hello&quot;)">
 FAILED:
 	CHECK( data.str_hello > "hello" )
 with expansion:
 	"hello" > "hello"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;hello&quot;)">
 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="CHECK(data.str_hello > &quot;hellp&quot;)">
 FAILED:
 	CHECK( data.str_hello > "hellp" )
 with expansion:
 	"hello" > "hellp"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello > &quot;z&quot;)">
 FAILED:
 	CHECK( data.str_hello > "z" )
 with expansion:
 	"hello" > "z"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;hellm&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt; "hellm" )
 with expansion:
 	"hello" &lt; "hellm"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt; &quot;a&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt; "a" )
 with expansion:
 	"hello" &lt; "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello >= &quot;z&quot;)">
 FAILED:
 	CHECK( data.str_hello >= "z" )
 with expansion:
 	"hello" >= "z"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(data.str_hello &lt;= &quot;a&quot;)">
 FAILED:
 	CHECK( data.str_hello &lt;= "a" )
 with expansion:
 	"hello" &lt;= "a"
-Condition.tests.cpp:<line number>
+at Condition.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Ordering comparison checks that should succeed" duration="{duration}"/>
@@ -862,7 +862,7 @@ FAILED:
 	CHECK( truthy(false) )
 with expansion:
 	Hey, its truthy!
-Decomposition.tests.cpp:<line number>
+at Decomposition.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -880,7 +880,7 @@ Decomposition.tests.cpp:<line number>
 FAILED:
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#748 - captures with unexpected exceptions/inside REQUIRE_NOTHROW" duration="{duration}">
@@ -889,7 +889,7 @@ FAILED:
 	REQUIRE_NOTHROW( thisThrows() )
 expected exception
 answer := 42
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" duration="{duration}"/>
@@ -898,7 +898,7 @@ Exception.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 name="Custom exceptions can be translated when testing for nothrow" duration="{duration}">
@@ -906,7 +906,7 @@ Exception.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 name="Custom exceptions can be translated when testing for throwing as something else" duration="{duration}">
@@ -914,14 +914,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 name="Custom std-exceptions can be custom translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 custom std exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Exception messages can be tested for/exact match" duration="{duration}"/>
@@ -932,18 +932,18 @@ Exception.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="CHECK_THROWS_AS(thisDoesntThrow(), std::domain_error)">
 FAILED:
 	CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </failure>
       <error message="CHECK_NOTHROW(thisThrows())">
 FAILED:
 	CHECK_NOTHROW( thisThrows() )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Mismatching exception messages failing the test" duration="{duration}">
@@ -952,28 +952,28 @@ 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 name="Non-std exceptions can be translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 custom exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Thrown string literals are translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 For some reason someone is throwing a string literal!
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="Unexpected exceptions can be translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 3.14
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When checked exceptions are thrown they can be expected or unexpected" duration="{duration}"/>
@@ -981,7 +981,7 @@ Exception.tests.cpp:<line number>
       <error message="TEST_CASE()">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown during a CHECK the test should continue" duration="{duration}">
@@ -989,7 +989,7 @@ Exception.tests.cpp:<line number>
 FAILED:
 	CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail" duration="{duration}">
@@ -997,7 +997,7 @@ Exception.tests.cpp:<line number>
 FAILED:
 	REQUIRE( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown from functions they are always failures" duration="{duration}">
@@ -1005,21 +1005,21 @@ Exception.tests.cpp:<line number>
 FAILED:
 	CHECK( thisThrows() == 0 )
 expected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="When unchecked exceptions are thrown from sections they are always failures/section name" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 unexpected exception
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
     <testCase name="thrown std::strings are translated" duration="{duration}">
       <error message="TEST_CASE()">
 FAILED:
 Why would you throw a std::string?
-Exception.tests.cpp:<line number>
+at Exception.tests.cpp:<line number>
       </error>
     </testCase>
   </file>
@@ -1069,14 +1069,14 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )
 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="CHECK_THAT(testStringForMatching(), ContainsSubstring( &quot;STRING&quot; ))">
 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 name="EndsWith string matcher" duration="{duration}">
@@ -1085,14 +1085,14 @@ 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="CHECK_THAT(testStringForMatching(), EndsWith( &quot;this&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )
 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 name="Equals" duration="{duration}"/>
@@ -1102,26 +1102,26 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), Equals( "this string contains 'ABC' as a substring" ) )
 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="CHECK_THAT(testStringForMatching(), Equals( &quot;something else&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )
 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 name="Exception matchers that fail/No exception" duration="{duration}">
       <failure message="CHECK_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 })">
 FAILED:
 	CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="REQUIRE_THROWS_MATCHES(doesNotThrow(), SpecialException, ExceptionMatcher{ 1 })">
 FAILED:
 	REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Exception matchers that fail/Type mismatch" duration="{duration}">
@@ -1129,13 +1129,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="REQUIRE_THROWS_MATCHES(throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 })">
 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 name="Exception matchers that fail/Contents are wrong" duration="{duration}">
@@ -1144,14 +1144,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="REQUIRE_THROWS_MATCHES(throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 })">
 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 name="Exception matchers that succeed" duration="{duration}"/>
@@ -1178,7 +1178,7 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) || ContainsSubstring( "different" ) ) &amp;&amp; ContainsSubstring( "random" ) )
 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 name="Matchers can be negated (Not) with the ! operator" duration="{duration}"/>
@@ -1188,7 +1188,7 @@ 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 name="Overloaded comma or address-of operators are not used" duration="{duration}"/>
@@ -1199,21 +1199,21 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "this STRING contains 'abc' as a substring" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "this STRING contains 'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), Matches( &quot;contains 'abc' as a substring&quot; ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "contains 'abc' as a substring" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "contains 'abc' as a substring" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), Matches( &quot;this string contains 'abc' as a&quot; ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), Matches( "this string contains 'abc' as a" ) )
 with expansion:
 	"this string contains 'abc' as a substring" matches "this string contains 'abc' as a" case sensitively
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Regression test #1" duration="{duration}"/>
@@ -1223,14 +1223,14 @@ FAILED:
 	CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )
 with expansion:
 	"this string contains 'abc' as a substring" starts with: "This String"
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(testStringForMatching(), StartsWith( &quot;string&quot;, Catch::CaseSensitive::No ))">
 FAILED:
 	CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )
 with expansion:
 	"this string contains 'abc' as a substring" starts with: "string" (case insensitive)
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="String matchers" duration="{duration}"/>
@@ -1244,7 +1244,7 @@ FAILED:
 	CHECK_THAT( empty, Approx( t1 ) )
 with expansion:
 	{  } is approx: { 1.0, 2.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector Approx matcher -- failing/Just different vectors" duration="{duration}">
@@ -1253,7 +1253,7 @@ FAILED:
 	CHECK_THAT( v1, Approx( v2 ) )
 with expansion:
 	{ 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers/Contains (element)" duration="{duration}"/>
@@ -1267,14 +1267,14 @@ FAILED:
 	CHECK_THAT( v, VectorContains( -1 ) )
 with expansion:
 	{ 1, 2, 3 } Contains: -1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, VectorContains( 1 ))">
 FAILED:
 	CHECK_THAT( empty, VectorContains( 1 ) )
 with expansion:
 	{  } Contains: 1
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/Contains (vector)" duration="{duration}">
@@ -1283,14 +1283,14 @@ FAILED:
 	CHECK_THAT( empty, Contains( v ) )
 with expansion:
 	{  } Contains: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v, Contains( v2 ))">
 FAILED:
 	CHECK_THAT( v, Contains( v2 ) )
 with expansion:
 	{ 1, 2, 3 } Contains: { 1, 2, 4 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/Equals" duration="{duration}">
@@ -1299,28 +1299,28 @@ FAILED:
 	CHECK_THAT( v, Equals( v2 ) )
 with expansion:
 	{ 1, 2, 3 } Equals: { 1, 2 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v2, Equals( v ))">
 FAILED:
 	CHECK_THAT( v2, Equals( v ) )
 with expansion:
 	{ 1, 2 } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, Equals( v ))">
 FAILED:
 	CHECK_THAT( empty, Equals( v ) )
 with expansion:
 	{  } Equals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(v, Equals( empty ))">
 FAILED:
 	CHECK_THAT( v, Equals( empty ) )
 with expansion:
 	{ 1, 2, 3 } Equals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Vector matchers that fail/UnorderedEquals" duration="{duration}">
@@ -1329,28 +1329,28 @@ FAILED:
 	CHECK_THAT( v, UnorderedEquals( empty ) )
 with expansion:
 	{ 1, 2, 3 } UnorderedEquals: {  }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(empty, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( empty, UnorderedEquals( v ) )
 with expansion:
 	{  } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(permuted, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
 	{ 1, 3 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
       <failure message="CHECK_THAT(permuted, UnorderedEquals( v ))">
 FAILED:
 	CHECK_THAT( permuted, UnorderedEquals( v ) )
 with expansion:
 	{ 3, 1 } UnorderedEquals: { 1, 2, 3 }
-Matchers.tests.cpp:<line number>
+at Matchers.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -1416,20 +1416,20 @@ Matchers.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="FAIL does not require an argument" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="FAIL_CHECK does not abort the test" duration="{duration}">
       <failure message="FAIL_CHECK()">
 FAILED:
 This is a failure
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="INFO and WARN do not abort tests" duration="{duration}"/>
@@ -1441,7 +1441,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 name="INFO gets logged on failure, even if captured before successful assertions" duration="{duration}">
@@ -1452,7 +1452,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="CHECK(a == 0)">
 FAILED:
@@ -1462,7 +1462,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 name="INFO is reset for each loop" duration="{duration}">
@@ -1473,21 +1473,21 @@ with expansion:
 	10 &lt; 10
 current counter 10
 i := 10
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Output from all sections is reported/one" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 Message from section one
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Output from all sections is reported/two" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 Message from section two
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="SUCCEED counts as a test pass" duration="{duration}"/>
@@ -1498,14 +1498,14 @@ Message.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 Previous info should not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="just failure after unscoped info" duration="{duration}">
       <failure message="FAIL()">
 FAILED:
 previous unscoped info SHOULD not be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="mix info, unscoped info and warning" duration="{duration}"/>
@@ -1514,7 +1514,7 @@ Message.tests.cpp:<line number>
 FAILED:
 	REQUIRE( false )
 this SHOULD be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="print unscoped info if passing unscoped info is printed" duration="{duration}"/>
@@ -1524,7 +1524,7 @@ FAILED:
 	REQUIRE( false )
 this SHOULD be seen
 this SHOULD also be seen
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="prints unscoped info only for the first assertion" duration="{duration}">
@@ -1532,7 +1532,7 @@ Message.tests.cpp:<line number>
 FAILED:
 	CHECK( false )
 this SHOULD be seen only ONCE
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="sends information to INFO" duration="{duration}">
@@ -1541,7 +1541,7 @@ FAILED:
 	REQUIRE( false )
 hi
 i := 7
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="stacks unscoped info in loops" duration="{duration}">
@@ -1552,7 +1552,7 @@ Count 1 to 3...
 1
 2
 3
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(false)">
 FAILED:
@@ -1561,7 +1561,7 @@ Count 4 to 6...
 4
 5
 6
-Message.tests.cpp:<line number>
+at Message.tests.cpp:<line number>
       </failure>
     </testCase>
   </file>
@@ -1577,7 +1577,7 @@ FAILED:
 	CHECK( f() == 0 )
 with expansion:
 	1 == 0
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="#961 -- Dynamically created sections should all be reported/Looped section 0" duration="{duration}"/>
@@ -1597,7 +1597,7 @@ Misc.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 to infinity and beyond
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="A couple of nested sections followed by a failure/Outer/Inner" duration="{duration}"/>
@@ -1621,7 +1621,7 @@ with expansion:
 	$a = 20;
 }
 "
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="Template test case with test types specified inside non-copyable and non-movable std::tuple - NonCopyableAndNonMovableTypes - 0" duration="{duration}"/>
@@ -1683,13 +1683,13 @@ Misc.tests.cpp:<line number>
     <testCase name="Testing checked-if 2" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="Testing checked-if 3" duration="{duration}">
       <skipped message="FAIL()">
 FAILED:
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </skipped>
     </testCase>
     <testCase name="This test 'should' fail but doesn't" duration="{duration}"/>
@@ -1700,7 +1700,7 @@ FAILED:
 	REQUIRE( testCheckedElse( false ) )
 with expansion:
 	false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="checkedIf" duration="{duration}"/>
@@ -1710,7 +1710,7 @@ FAILED:
 	REQUIRE( testCheckedIf( false ) )
 with expansion:
 	false
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="even more nested SECTION tests/c/d (leaf)" duration="{duration}"/>
@@ -1723,7 +1723,7 @@ FAILED:
 	CHECK( b > a )
 with expansion:
 	0 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="looped SECTION tests/b is currently: 1" duration="{duration}">
@@ -1732,7 +1732,7 @@ FAILED:
 	CHECK( b > a )
 with expansion:
 	1 > 1
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="looped SECTION tests/b is currently: 2" duration="{duration}"/>
@@ -1750,7 +1750,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[0] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1758,7 +1758,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[1] (1) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1766,7 +1766,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[3] (3) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1774,7 +1774,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[4] (5) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1782,7 +1782,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[6] (13) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
       <failure message="CHECK(( fib[i] % 2 ) == 0)">
 FAILED:
@@ -1790,7 +1790,7 @@ FAILED:
 with expansion:
 	1 == 0
 Testing if fib[7] (21) is even
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="more nested SECTION tests/equal/doesn't equal" duration="{duration}">
@@ -1799,7 +1799,7 @@ FAILED:
 	REQUIRE( a == b )
 with expansion:
 	1 == 2
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="more nested SECTION tests/doesn't equal/not equal" duration="{duration}"/>
@@ -1815,7 +1815,7 @@ Misc.tests.cpp:<line number>
 FAILED:
 	REQUIRE( false )
 3
-Misc.tests.cpp:<line number>
+at Misc.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="toString on const wchar_t const pointer returns the string contents" duration="{duration}"/>
@@ -1892,7 +1892,7 @@ Misc.tests.cpp:<line number>
       <failure message="FAIL()">
 FAILED:
 1514
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="(unimplemented) static bools can be evaluated/compare to true" duration="{duration}"/>
@@ -1906,14 +1906,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="CHECK(o1 == o2)">
 FAILED:
 	CHECK( o1 == o2 )
 with expansion:
 	{?} == {?}
-Tricky.tests.cpp:<line number>
+at Tricky.tests.cpp:<line number>
       </failure>
     </testCase>
     <testCase name="An expression with side-effects should only be evaluated once" duration="{duration}"/>
diff --git a/tests/SelfTest/Baselines/teamcity.sw.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
index 58ad2aed..f0010e2e 100644
--- a/tests/SelfTest/Baselines/teamcity.sw.approved.txt
+++ b/tests/SelfTest/Baselines/teamcity.sw.approved.txt
@@ -18,7 +18,7 @@
 ##teamcity[testStarted name='#1455 - INFO and WARN can start with a linebreak']
 ##teamcity[testFinished name='#1455 - INFO and WARN can start with a linebreak' duration="{duration}"]
 ##teamcity[testStarted name='#1514: stderr/stdout is not captured in tests aborted by an exception']
-Tricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
+##teamcity[testFailed name='#1514: stderr/stdout is not captured in tests aborted by an exception' message='Tricky.tests.cpp:<line number>|n...............................................................................|n|nTricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
 ##teamcity[testStdOut name='#1514: stderr/stdout is not captured in tests aborted by an exception' out='This would not be caught previously|n']
 ##teamcity[testStdErr name='#1514: stderr/stdout is not captured in tests aborted by an exception' out='Nor would this|n']
 ##teamcity[testFinished name='#1514: stderr/stdout is not captured in tests aborted by an exception' duration="{duration}"]
@@ -53,29 +53,29 @@ Tricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
 ##teamcity[testStarted name='#2152 - ULP checks between differently signed values were wrong - float']
 ##teamcity[testFinished name='#2152 - ULP checks between differently signed values were wrong - float' duration="{duration}"]
 ##teamcity[testStarted name='#748 - captures with unexpected exceptions']
-Exception.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"- failure ignore as test marked as |'ok to fail|'|n']
-Exception.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"|n  REQUIRE_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#748 - captures with unexpected exceptions' message='-------------------------------------------------------------------------------|noutside assertions|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#748 - captures with unexpected exceptions' message='-------------------------------------------------------------------------------|ninside REQUIRE_NOTHROW|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"|n  REQUIRE_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='#748 - captures with unexpected exceptions' duration="{duration}"]
 ##teamcity[testStarted name='#809']
 ##teamcity[testFinished name='#809' duration="{duration}"]
 ##teamcity[testStarted name='#833']
 ##teamcity[testFinished name='#833' duration="{duration}"]
 ##teamcity[testStarted name='#835 -- errno should not be touched by Catch2']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( f() == 0 )|nwith expansion:|n  1 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#835 -- errno should not be touched by Catch2' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( f() == 0 )|nwith expansion:|n  1 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='#835 -- errno should not be touched by Catch2' duration="{duration}"]
 ##teamcity[testStarted name='#872']
 ##teamcity[testFinished name='#872' duration="{duration}"]
 ##teamcity[testStarted name='#961 -- Dynamically created sections should all be reported']
 ##teamcity[testFinished name='#961 -- Dynamically created sections should all be reported' duration="{duration}"]
 ##teamcity[testStarted name='|'Not|' checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( false != false )|nwith expansion:|n  false != false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( true != true )|nwith expansion:|n  true != true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !true )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( true )|nwith expansion:|n  !true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !trueValue )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( trueValue )|nwith expansion:|n  !true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !(1 == 1) )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nwith expansion:|n  !(1 == 1)|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( false != false )|nwith expansion:|n  false != false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( true != true )|nwith expansion:|n  true != true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !true )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( true )|nwith expansion:|n  !true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !trueValue )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( trueValue )|nwith expansion:|n  !true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !(1 == 1) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nwith expansion:|n  !(1 == 1)|n']
 ##teamcity[testFinished name='|'Not|' checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='|'Not|' checks that should succeed']
 ##teamcity[testFinished name='|'Not|' checks that should succeed' duration="{duration}"]
@@ -84,21 +84,21 @@ Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nw
 ##teamcity[testStarted name='3x3x3 ints']
 ##teamcity[testFinished name='3x3x3 ints' duration="{duration}"]
 ##teamcity[testStarted name='A METHOD_AS_TEST_CASE based test run that fails']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( s == "world" )|nwith expansion:|n  "hello" == "world"|n']
+##teamcity[testFailed name='A METHOD_AS_TEST_CASE based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( s == "world" )|nwith expansion:|n  "hello" == "world"|n']
 ##teamcity[testFinished name='A METHOD_AS_TEST_CASE based test run that fails' duration="{duration}"]
 ##teamcity[testStarted name='A METHOD_AS_TEST_CASE based test run that succeeds']
 ##teamcity[testFinished name='A METHOD_AS_TEST_CASE based test run that succeeds' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<float>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<float>' duration="{duration}"]
@@ -109,16 +109,16 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<float,6>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<float,6>' duration="{duration}"]
@@ -129,13 +129,13 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0f == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0f == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double' duration="{duration}"]
@@ -144,13 +144,13 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<Te
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  3 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  3 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  6 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  6 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1' duration="{duration}"]
@@ -159,7 +159,7 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::va
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that fails']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='A TEST_CASE_METHOD based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that fails' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that succeeds']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that succeeds' duration="{duration}"]
@@ -182,11 +182,11 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith ex
 ##teamcity[testStarted name='A comparison that uses literals instead of the normal constructor']
 ##teamcity[testFinished name='A comparison that uses literals instead of the normal constructor' duration="{duration}"]
 ##teamcity[testStarted name='A couple of nested sections followed by a failure']
-Misc.tests.cpp:<line number>|nexplicit failure with message:|n  "to infinity and beyond"']
+##teamcity[testFailed name='A couple of nested sections followed by a failure' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure with message:|n  "to infinity and beyond"']
 ##teamcity[testFinished name='A couple of nested sections followed by a failure' duration="{duration}"]
 ##teamcity[testStarted name='A failing expression with a non streamable type is still captured']
-Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( &o1 == &o2 )|nwith expansion:|n  0x<hex digits> == 0x<hex digits>|n']
-Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith expansion:|n  {?} == {?}|n']
+##teamcity[testFailed name='A failing expression with a non streamable type is still captured' message='Tricky.tests.cpp:<line number>|n...............................................................................|n|nTricky.tests.cpp:<line number>|nexpression failed|n  CHECK( &o1 == &o2 )|nwith expansion:|n  0x<hex digits> == 0x<hex digits>|n']
+##teamcity[testFailed name='A failing expression with a non streamable type is still captured' message='Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith expansion:|n  {?} == {?}|n']
 ##teamcity[testFinished name='A failing expression with a non streamable type is still captured' duration="{duration}"]
 ##teamcity[testStarted name='Absolute margin']
 ##teamcity[testFinished name='Absolute margin' duration="{duration}"]
@@ -195,7 +195,7 @@ Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith exp
 ##teamcity[testStarted name='An expression with side-effects should only be evaluated once']
 ##teamcity[testFinished name='An expression with side-effects should only be evaluated once' duration="{duration}"]
 ##teamcity[testStarted name='An unchecked exception reports the line of the last assertion']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n']
+##teamcity[testFailed name='An unchecked exception reports the line of the last assertion' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n']
 ##teamcity[testFinished name='An unchecked exception reports the line of the last assertion' duration="{duration}"]
 ##teamcity[testStarted name='Anonymous test case 1']
 ##teamcity[testFinished name='Anonymous test case 1' duration="{duration}"]
@@ -276,21 +276,21 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpe
 ##teamcity[testStarted name='Composed matchers shortcircuit']
 ##teamcity[testFinished name='Composed matchers shortcircuit' duration="{duration}"]
 ##teamcity[testStarted name='Contains string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "not there" (case insensitive)|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "STRING" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "STRING"|n']
+##teamcity[testFailed name='Contains string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "not there" (case insensitive)|n']
+##teamcity[testFailed name='Contains string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "STRING" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "STRING"|n']
 ##teamcity[testFinished name='Contains string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Copy and then generate a range']
 ##teamcity[testFinished name='Copy and then generate a range' duration="{duration}"]
 ##teamcity[testStarted name='Cout stream properly declares it writes to stdout']
 ##teamcity[testFinished name='Cout stream properly declares it writes to stdout' duration="{duration}"]
 ##teamcity[testStarted name='Custom exceptions can be translated when testing for nothrow']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_NOTHROW( throwCustom() )|nwith expansion:|n  throwCustom()|n']
+##teamcity[testFailed name='Custom exceptions can be translated when testing for nothrow' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_NOTHROW( throwCustom() )|nwith expansion:|n  throwCustom()|n']
 ##teamcity[testFinished name='Custom exceptions can be translated when testing for nothrow' duration="{duration}"]
 ##teamcity[testStarted name='Custom exceptions can be translated when testing for throwing as something else']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_THROWS_AS( throwCustom(), std::exception )|nwith expansion:|n  throwCustom(), std::exception|n']
+##teamcity[testFailed name='Custom exceptions can be translated when testing for throwing as something else' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_THROWS_AS( throwCustom(), std::exception )|nwith expansion:|n  throwCustom(), std::exception|n']
 ##teamcity[testFinished name='Custom exceptions can be translated when testing for throwing as something else' duration="{duration}"]
 ##teamcity[testStarted name='Custom std-exceptions can be custom translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom std exception"']
+##teamcity[testFailed name='Custom std-exceptions can be custom translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom std exception"']
 ##teamcity[testFinished name='Custom std-exceptions can be custom translated' duration="{duration}"]
 ##teamcity[testStarted name='Default scale is invisible to comparison']
 ##teamcity[testFinished name='Default scale is invisible to comparison' duration="{duration}"]
@@ -301,8 +301,8 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom
 ##teamcity[testStarted name='Empty tag is not allowed']
 ##teamcity[testFinished name='Empty tag is not allowed' duration="{duration}"]
 ##teamcity[testStarted name='EndsWith string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
+##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
+##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
 ##teamcity[testFinished name='EndsWith string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Enums can quickly have stringification enabled using REGISTER_ENUM']
 ##teamcity[testFinished name='Enums can quickly have stringification enabled using REGISTER_ENUM' duration="{duration}"]
@@ -311,37 +311,37 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStarted name='Epsilon only applies to Approx|'s value']
 ##teamcity[testFinished name='Epsilon only applies to Approx|'s value' duration="{duration}"]
 ##teamcity[testStarted name='Equality checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 6 )|nwith expansion:|n  7 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 8 )|nwith expansion:|n  7 == 8|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 0 )|nwith expansion:|n  7 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.11f ) )|nwith expansion:|n  9.1f == Approx( 9.1099996567 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.0f ) )|nwith expansion:|n  9.1f == Approx( 9.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 1 ) )|nwith expansion:|n  9.1f == Approx( 1.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 0 ) )|nwith expansion:|n  9.1f == Approx( 0.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi == Approx( 3.1415 ) )|nwith expansion:|n  3.1415926535 == Approx( 3.1415 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "goodbye" )|nwith expansion:|n  "hello" == "goodbye"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hell" )|nwith expansion:|n  "hello" == "hell"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hello1" )|nwith expansion:|n  "hello" == "hello1"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() == 6 )|nwith expansion:|n  5 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( x == Approx( 1.301 ) )|nwith expansion:|n  1.3 == Approx( 1.301 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 6 )|nwith expansion:|n  7 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 8 )|nwith expansion:|n  7 == 8|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 0 )|nwith expansion:|n  7 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.11f ) )|nwith expansion:|n  9.1f == Approx( 9.1099996567 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.0f ) )|nwith expansion:|n  9.1f == Approx( 9.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 1 ) )|nwith expansion:|n  9.1f == Approx( 1.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 0 ) )|nwith expansion:|n  9.1f == Approx( 0.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi == Approx( 3.1415 ) )|nwith expansion:|n  3.1415926535 == Approx( 3.1415 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "goodbye" )|nwith expansion:|n  "hello" == "goodbye"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hell" )|nwith expansion:|n  "hello" == "hell"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hello1" )|nwith expansion:|n  "hello" == "hello1"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() == 6 )|nwith expansion:|n  5 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( x == Approx( 1.301 ) )|nwith expansion:|n  1.3 == Approx( 1.301 )|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Equality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Equality checks that should succeed']
 ##teamcity[testFinished name='Equality checks that should succeed' duration="{duration}"]
 ##teamcity[testStarted name='Equals']
 ##teamcity[testFinished name='Equals' duration="{duration}"]
 ##teamcity[testStarted name='Equals string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "this string contains |'ABC|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "this string contains |'ABC|' as a substring"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "something else" (case insensitive)|n']
+##teamcity[testFailed name='Equals string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "this string contains |'ABC|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "this string contains |'ABC|' as a substring"|n']
+##teamcity[testFailed name='Equals string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "something else" (case insensitive)|n']
 ##teamcity[testFinished name='Equals string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified']
 ##teamcity[testFinished name='Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified' duration="{duration}"]
 ##teamcity[testStarted name='Exception matchers that fail']
-Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  CHECK_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  REQUIRE_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THROWS_MATCHES( throwsSpecialException( 3 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nNo exception|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nType mismatch|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  CHECK_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  REQUIRE_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nContents are wrong|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THROWS_MATCHES( throwsSpecialException( 3 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
 ##teamcity[testFinished name='Exception matchers that fail' duration="{duration}"]
 ##teamcity[testStarted name='Exception matchers that succeed']
 ##teamcity[testFinished name='Exception matchers that succeed' duration="{duration}"]
@@ -352,18 +352,18 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( t
 ##teamcity[testStarted name='Exceptions matchers']
 ##teamcity[testFinished name='Exceptions matchers' duration="{duration}"]
 ##teamcity[testStarted name='Expected exceptions that don|'t throw or unexpected exceptions fail the test']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_THROWS_AS( thisThrows(), std::string )|nwith expansion:|n  thisThrows(), std::string|n']
-Exception.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )|nwith expansion:|n  thisDoesntThrow(), std::domain_error|n']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_THROWS_AS( thisThrows(), std::string )|nwith expansion:|n  thisThrows(), std::string|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )|nwith expansion:|n  thisDoesntThrow(), std::domain_error|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n']
 ##teamcity[testFinished name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' duration="{duration}"]
 ##teamcity[testStarted name='FAIL aborts the test']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
+##teamcity[testFailed name='FAIL aborts the test' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
 ##teamcity[testFinished name='FAIL aborts the test' duration="{duration}"]
 ##teamcity[testStarted name='FAIL does not require an argument']
-Message.tests.cpp:<line number>|nexplicit failure']
+##teamcity[testFailed name='FAIL does not require an argument' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure']
 ##teamcity[testFinished name='FAIL does not require an argument' duration="{duration}"]
 ##teamcity[testStarted name='FAIL_CHECK does not abort the test']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
+##teamcity[testFailed name='FAIL_CHECK does not abort the test' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
 ##teamcity[testFinished name='FAIL_CHECK does not abort the test' duration="{duration}"]
 ##teamcity[testStarted name='Factorials are computed']
 ##teamcity[testFinished name='Factorials are computed' duration="{duration}"]
@@ -390,21 +390,21 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a fa
 ##teamcity[testStarted name='INFO and WARN do not abort tests']
 ##teamcity[testFinished name='INFO and WARN do not abort tests' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message should be logged"|n  "so should this"|n  REQUIRE( a == 1 )|nwith expansion:|n  2 == 1|n']
+##teamcity[testFailed name='INFO gets logged on failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this message should be logged"|n  "so should this"|n  REQUIRE( a == 1 )|nwith expansion:|n  2 == 1|n']
 ##teamcity[testFinished name='INFO gets logged on failure' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure, even if captured before successful assertions']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  CHECK( a == 1 )|nwith expansion:|n  2 == 1|n']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  "and this, but later"|n  CHECK( a == 0 )|nwith expansion:|n  2 == 0|n']
+##teamcity[testFailed name='INFO gets logged on failure, even if captured before successful assertions' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  CHECK( a == 1 )|nwith expansion:|n  2 == 1|n']
+##teamcity[testFailed name='INFO gets logged on failure, even if captured before successful assertions' message='Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  "and this, but later"|n  CHECK( a == 0 )|nwith expansion:|n  2 == 0|n']
 ##teamcity[testFinished name='INFO gets logged on failure, even if captured before successful assertions' duration="{duration}"]
 ##teamcity[testStarted name='INFO is reset for each loop']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
+##teamcity[testFailed name='INFO is reset for each loop' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
 ##teamcity[testFinished name='INFO is reset for each loop' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi != Approx( 3.1415926535 ) )|nwith expansion:|n  3.1415926535 != Approx( 3.1415926535 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello != "hello" )|nwith expansion:|n  "hello" != "hello"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() != 5 )|nwith expansion:|n  5 != 5|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi != Approx( 3.1415926535 ) )|nwith expansion:|n  3.1415926535 != Approx( 3.1415926535 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello != "hello" )|nwith expansion:|n  "hello" != "hello"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() != 5 )|nwith expansion:|n  5 != 5|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Inequality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should succeed']
 ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
@@ -421,21 +421,21 @@ Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.si
 ##teamcity[testStarted name='Matchers can be composed with both && and ||||']
 ##teamcity[testFinished name='Matchers can be composed with both && and ||||' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be composed with both && and |||| - failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) |||| ContainsSubstring( "different" ) ) && ContainsSubstring( "random" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )|n']
+##teamcity[testFailed name='Matchers can be composed with both && and |||| - failing' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) |||| ContainsSubstring( "different" ) ) && ContainsSubstring( "random" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )|n']
 ##teamcity[testFinished name='Matchers can be composed with both && and |||| - failing' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be negated (Not) with the ! operator']
 ##teamcity[testFinished name='Matchers can be negated (Not) with the ! operator' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be negated (Not) with the ! operator - failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), !ContainsSubstring( "substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" not contains: "substring"|n']
+##teamcity[testFailed name='Matchers can be negated (Not) with the ! operator - failing' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), !ContainsSubstring( "substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" not contains: "substring"|n']
 ##teamcity[testFinished name='Matchers can be negated (Not) with the ! operator - failing' duration="{duration}"]
 ##teamcity[testStarted name='Mayfail test case with nested sections']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nA|n1|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nA|n2|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nB|n1|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nB|n2|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Mayfail test case with nested sections' duration="{duration}"]
 ##teamcity[testStarted name='Mismatching exception messages failing the test']
-Exception.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )|nwith expansion:|n  "expected exception" equals: "should fail"|n']
+##teamcity[testFailed name='Mismatching exception messages failing the test' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )|nwith expansion:|n  "expected exception" equals: "should fail"|n']
 ##teamcity[testFinished name='Mismatching exception messages failing the test' duration="{duration}"]
 ##teamcity[testStarted name='Multireporter calls reporters and listeners in correct order']
 ##teamcity[testFinished name='Multireporter calls reporters and listeners in correct order' duration="{duration}"]
@@ -446,40 +446,40 @@ Exception.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thi
 ##teamcity[testStarted name='Nice descriptive name']
 ##teamcity[testFinished name='Nice descriptive name' duration="{duration}"]
 ##teamcity[testStarted name='Non-std exceptions can be translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception"']
+##teamcity[testFailed name='Non-std exceptions can be translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception"']
 ##teamcity[testFinished name='Non-std exceptions can be translated' duration="{duration}"]
 ##teamcity[testStarted name='Objects that evaluated in boolean contexts can be checked']
 ##teamcity[testFinished name='Objects that evaluated in boolean contexts can be checked' duration="{duration}"]
 ##teamcity[testStarted name='Optionally static assertions']
 ##teamcity[testFinished name='Optionally static assertions' duration="{duration}"]
 ##teamcity[testStarted name='Ordering comparison checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 7 )|nwith expansion:|n  7 > 7|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 7 )|nwith expansion:|n  7 < 7|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 8 )|nwith expansion:|n  7 > 8|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 6 )|nwith expansion:|n  7 < 6|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 0 )|nwith expansion:|n  7 < 0|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < -1 )|nwith expansion:|n  7 < -1|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven >= 8 )|nwith expansion:|n  7 >= 8|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven <= 6 )|nwith expansion:|n  7 <= 6|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one < 9 )|nwith expansion:|n  9.1f < 9|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 10 )|nwith expansion:|n  9.1f > 10|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 9.2 )|nwith expansion:|n  9.1f > 9.2|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hello" )|nwith expansion:|n  "hello" > "hello"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hello" )|nwith expansion:|n  "hello" < "hello"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hellp" )|nwith expansion:|n  "hello" > "hellp"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "z" )|nwith expansion:|n  "hello" > "z"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hellm" )|nwith expansion:|n  "hello" < "hellm"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "a" )|nwith expansion:|n  "hello" < "a"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello >= "z" )|nwith expansion:|n  "hello" >= "z"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello <= "a" )|nwith expansion:|n  "hello" <= "a"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 7 )|nwith expansion:|n  7 > 7|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 7 )|nwith expansion:|n  7 < 7|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 8 )|nwith expansion:|n  7 > 8|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 6 )|nwith expansion:|n  7 < 6|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 0 )|nwith expansion:|n  7 < 0|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < -1 )|nwith expansion:|n  7 < -1|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven >= 8 )|nwith expansion:|n  7 >= 8|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven <= 6 )|nwith expansion:|n  7 <= 6|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one < 9 )|nwith expansion:|n  9.1f < 9|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 10 )|nwith expansion:|n  9.1f > 10|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 9.2 )|nwith expansion:|n  9.1f > 9.2|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hello" )|nwith expansion:|n  "hello" > "hello"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hello" )|nwith expansion:|n  "hello" < "hello"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hellp" )|nwith expansion:|n  "hello" > "hellp"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "z" )|nwith expansion:|n  "hello" > "z"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hellm" )|nwith expansion:|n  "hello" < "hellm"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "a" )|nwith expansion:|n  "hello" < "a"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello >= "z" )|nwith expansion:|n  "hello" >= "z"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello <= "a" )|nwith expansion:|n  "hello" <= "a"|n']
 ##teamcity[testFinished name='Ordering comparison checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Ordering comparison checks that should succeed']
 ##teamcity[testFinished name='Ordering comparison checks that should succeed' duration="{duration}"]
 ##teamcity[testStarted name='Our PCG implementation provides expected results for known seeds']
 ##teamcity[testFinished name='Our PCG implementation provides expected results for known seeds' duration="{duration}"]
 ##teamcity[testStarted name='Output from all sections is reported']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section one"']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section two"']
+##teamcity[testFailed name='Output from all sections is reported' message='-------------------------------------------------------------------------------|none|n-------------------------------------------------------------------------------|nMessage.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section one"']
+##teamcity[testFailed name='Output from all sections is reported' message='-------------------------------------------------------------------------------|ntwo|n-------------------------------------------------------------------------------|nMessage.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section two"']
 ##teamcity[testFinished name='Output from all sections is reported' duration="{duration}"]
 ##teamcity[testStarted name='Overloaded comma or address-of operators are not used']
 ##teamcity[testFinished name='Overloaded comma or address-of operators are not used' duration="{duration}"]
@@ -514,12 +514,12 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from
 ##teamcity[testStarted name='Range type with sentinel']
 ##teamcity[testFinished name='Range type with sentinel' duration="{duration}"]
 ##teamcity[testStarted name='Reconstruction should be based on stringification: #914']
-Decomposition.tests.cpp:<line number>|nexpression failed|n  CHECK( truthy(false) )|nwith expansion:|n  Hey, its truthy!|n']
+##teamcity[testFailed name='Reconstruction should be based on stringification: #914' message='Decomposition.tests.cpp:<line number>|n...............................................................................|n|nDecomposition.tests.cpp:<line number>|nexpression failed|n  CHECK( truthy(false) )|nwith expansion:|n  Hey, its truthy!|n']
 ##teamcity[testFinished name='Reconstruction should be based on stringification: #914' duration="{duration}"]
 ##teamcity[testStarted name='Regex string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this STRING contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this STRING contains |'abc|' as a substring" case sensitively|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "contains |'abc|' as a substring" case sensitively|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this string contains |'abc|' as a" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this string contains |'abc|' as a" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this STRING contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this STRING contains |'abc|' as a substring" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "contains |'abc|' as a substring" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this string contains |'abc|' as a" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this string contains |'abc|' as a" case sensitively|n']
 ##teamcity[testFinished name='Regex string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Registering reporter with |'::|' in name fails']
 ##teamcity[testFinished name='Registering reporter with |'::|' in name fails' duration="{duration}"]
@@ -551,8 +551,8 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStdOut name='Standard output from all sections is reported' out='Message from section one|nMessage from section two|n']
 ##teamcity[testFinished name='Standard output from all sections is reported' duration="{duration}"]
 ##teamcity[testStarted name='StartsWith string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "This String"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "string" (case insensitive)|n']
+##teamcity[testFailed name='StartsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "This String"|n']
+##teamcity[testFailed name='StartsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "string" (case insensitive)|n']
 ##teamcity[testFinished name='StartsWith string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Static arrays are convertible to string']
 ##teamcity[testFinished name='Static arrays are convertible to string' duration="{duration}"]
@@ -575,7 +575,7 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStarted name='Stringifying std::chrono::time_point<system_clock>']
 ##teamcity[testFinished name='Stringifying std::chrono::time_point<system_clock>' duration="{duration}"]
 ##teamcity[testStarted name='Tabs and newlines show in output']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expansion:|n  "if ($b == 10) {|n		$a	= 20;|n}"|n==|n"if ($b == 10) {|n	$a = 20;|n}|n"|n']
+##teamcity[testFailed name='Tabs and newlines show in output' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expansion:|n  "if ($b == 10) {|n		$a	= 20;|n}"|n==|n"if ($b == 10) {|n	$a = 20;|n}|n"|n']
 ##teamcity[testFinished name='Tabs and newlines show in output' duration="{duration}"]
 ##teamcity[testStarted name='Tag alias can be registered against tag patterns']
 ##teamcity[testFinished name='Tag alias can be registered against tag patterns' duration="{duration}"]
@@ -628,10 +628,10 @@ Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expan
 ##teamcity[testStarted name='Testing checked-if']
 ##teamcity[testFinished name='Testing checked-if' duration="{duration}"]
 ##teamcity[testStarted name='Testing checked-if 2']
-Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Testing checked-if 2' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 2' duration="{duration}"]
 ##teamcity[testStarted name='Testing checked-if 3']
-Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Testing checked-if 3' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 3' duration="{duration}"]
 ##teamcity[testStarted name='The NO_FAIL macro reports a failure but does not fail the test']
 ##teamcity[testFinished name='The NO_FAIL macro reports a failure but does not fail the test' duration="{duration}"]
@@ -640,14 +640,14 @@ Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as
 ##teamcity[testStarted name='This test |'should|' fail but doesn|'t']
 ##teamcity[testFinished name='This test |'should|' fail but doesn|'t' duration="{duration}"]
 ##teamcity[testStarted name='Thrown string literals are translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "For some reason someone is throwing a string literal!"']
+##teamcity[testFailed name='Thrown string literals are translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "For some reason someone is throwing a string literal!"']
 ##teamcity[testFinished name='Thrown string literals are translated' duration="{duration}"]
 ##teamcity[testStarted name='Tracker']
 ##teamcity[testFinished name='Tracker' duration="{duration}"]
 ##teamcity[testStarted name='Trim strings']
 ##teamcity[testFinished name='Trim strings' duration="{duration}"]
 ##teamcity[testStarted name='Unexpected exceptions can be translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"']
+##teamcity[testFailed name='Unexpected exceptions can be translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"']
 ##teamcity[testFinished name='Unexpected exceptions can be translated' duration="{duration}"]
 ##teamcity[testStarted name='Upcasting special member functions']
 ##teamcity[testFinished name='Upcasting special member functions' duration="{duration}"]
@@ -672,41 +672,41 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"'
 ##teamcity[testStarted name='Vector Approx matcher']
 ##teamcity[testFinished name='Vector Approx matcher' duration="{duration}"]
 ##teamcity[testStarted name='Vector Approx matcher -- failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Approx( t1 ) )|nwith expansion:|n  {  } is approx: { 1.0, 2.0 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v1, Approx( v2 ) )|nwith expansion:|n  { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }|n']
+##teamcity[testFailed name='Vector Approx matcher -- failing' message='-------------------------------------------------------------------------------|nEmpty and non empty vectors are not approx equal|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Approx( t1 ) )|nwith expansion:|n  {  } is approx: { 1.0, 2.0 }|n']
+##teamcity[testFailed name='Vector Approx matcher -- failing' message='-------------------------------------------------------------------------------|nJust different vectors|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v1, Approx( v2 ) )|nwith expansion:|n  { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }|n']
 ##teamcity[testFinished name='Vector Approx matcher -- failing' duration="{duration}"]
 ##teamcity[testStarted name='Vector matchers']
 ##teamcity[testFinished name='Vector matchers' duration="{duration}"]
 ##teamcity[testStarted name='Vector matchers that fail']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, VectorContains( -1 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: -1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, VectorContains( 1 ) )|nwith expansion:|n  {  } Contains: 1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Contains( v ) )|nwith expansion:|n  {  } Contains: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Contains( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: { 1, 2, 4 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Equals: { 1, 2 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v2, Equals( v ) )|nwith expansion:|n  { 1, 2 } Equals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Equals( v ) )|nwith expansion:|n  {  } Equals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( empty ) )|nwith expansion:|n  { 1, 2, 3 } Equals: {  }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, UnorderedEquals( empty ) )|nwith expansion:|n  { 1, 2, 3 } UnorderedEquals: {  }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, UnorderedEquals( v ) )|nwith expansion:|n  {  } UnorderedEquals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 1, 3 } UnorderedEquals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 3, 1 } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nContains (element)|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, VectorContains( -1 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: -1|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, VectorContains( 1 ) )|nwith expansion:|n  {  } Contains: 1|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nContains (vector)|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Contains( v ) )|nwith expansion:|n  {  } Contains: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Contains( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: { 1, 2, 4 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nEquals|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Equals: { 1, 2 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v2, Equals( v ) )|nwith expansion:|n  { 1, 2 } Equals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Equals( v ) )|nwith expansion:|n  {  } Equals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( empty ) )|nwith expansion:|n  { 1, 2, 3 } Equals: {  }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nUnorderedEquals|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, UnorderedEquals( empty ) )|nwith expansion:|n  { 1, 2, 3 } UnorderedEquals: {  }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, UnorderedEquals( v ) )|nwith expansion:|n  {  } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 1, 3 } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 3, 1 } UnorderedEquals: { 1, 2, 3 }|n']
 ##teamcity[testFinished name='Vector matchers that fail' duration="{duration}"]
 ##teamcity[testStarted name='When checked exceptions are thrown they can be expected or unexpected']
 ##teamcity[testFinished name='When checked exceptions are thrown they can be expected or unexpected' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown directly they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
+##teamcity[testFailed name='When unchecked exceptions are thrown directly they are always failures' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
 ##teamcity[testFinished name='When unchecked exceptions are thrown directly they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown during a CHECK the test should continue']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown during a CHECK the test should continue' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown during a CHECK the test should continue' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  REQUIRE( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  REQUIRE( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown from functions they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown from functions they are always failures' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown from functions they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown from sections they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
+##teamcity[testFailed name='When unchecked exceptions are thrown from sections they are always failures' message='-------------------------------------------------------------------------------|nsection name|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
 ##teamcity[testFinished name='When unchecked exceptions are thrown from sections they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown, but caught, they do not affect the test']
 ##teamcity[testFinished name='When unchecked exceptions are thrown, but caught, they do not affect the test' duration="{duration}"]
@@ -733,12 +733,12 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpe
 ##teamcity[testStarted name='checkedElse']
 ##teamcity[testFinished name='checkedElse' duration="{duration}"]
 ##teamcity[testStarted name='checkedElse, failing']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedElse( false ) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='checkedElse, failing' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedElse( false ) )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='checkedElse, failing' duration="{duration}"]
 ##teamcity[testStarted name='checkedIf']
 ##teamcity[testFinished name='checkedIf' duration="{duration}"]
 ##teamcity[testStarted name='checkedIf, failing']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedIf( false ) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='checkedIf, failing' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedIf( false ) )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='checkedIf, failing' duration="{duration}"]
 ##teamcity[testStarted name='classify_outliers']
 ##teamcity[testFinished name='classify_outliers' duration="{duration}"]
@@ -764,10 +764,10 @@ loose text artifact
 ##teamcity[testStarted name='is_unary_function']
 ##teamcity[testFinished name='is_unary_function' duration="{duration}"]
 ##teamcity[testStarted name='just failure']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Previous info should not be seen"']
+##teamcity[testFailed name='just failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Previous info should not be seen"']
 ##teamcity[testFinished name='just failure' duration="{duration}"]
 ##teamcity[testStarted name='just failure after unscoped info']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "previous unscoped info SHOULD not be seen"']
+##teamcity[testFailed name='just failure after unscoped info' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "previous unscoped info SHOULD not be seen"']
 ##teamcity[testFinished name='just failure after unscoped info' duration="{duration}"]
 ##teamcity[testStarted name='just info']
 ##teamcity[testFinished name='just info' duration="{duration}"]
@@ -776,16 +776,16 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "previous uns
 ##teamcity[testStarted name='long long']
 ##teamcity[testFinished name='long long' duration="{duration}"]
 ##teamcity[testStarted name='looped SECTION tests']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  0 > 1|n']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  1 > 1|n']
+##teamcity[testFailed name='looped SECTION tests' message='-------------------------------------------------------------------------------|nb is currently: 0|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  0 > 1|n']
+##teamcity[testFailed name='looped SECTION tests' message='-------------------------------------------------------------------------------|nb is currently: 1|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  1 > 1|n']
 ##teamcity[testFinished name='looped SECTION tests' duration="{duration}"]
 ##teamcity[testStarted name='looped tests']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[0|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[1|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[3|] (3) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[4|] (5) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[6|] (13) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[7|] (21) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[0|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[1|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[3|] (3) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[4|] (5) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[6|] (13) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[7|] (21) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='looped tests' duration="{duration}"]
 ##teamcity[testStarted name='makeStream recognizes %debug stream name']
 ##teamcity[testFinished name='makeStream recognizes %debug stream name' duration="{duration}"]
@@ -798,7 +798,7 @@ Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib
 ##teamcity[testStarted name='mix info, unscoped info and warning']
 ##teamcity[testFinished name='mix info, unscoped info and warning' duration="{duration}"]
 ##teamcity[testStarted name='more nested SECTION tests']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='more nested SECTION tests' message='-------------------------------------------------------------------------------|ndoesn|'t equal|nequal|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='more nested SECTION tests' duration="{duration}"]
 ##teamcity[testStarted name='nested SECTION tests']
 ##teamcity[testFinished name='nested SECTION tests' duration="{duration}"]
@@ -813,7 +813,7 @@ Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expan
 ##teamcity[testStarted name='not allowed']
 ##teamcity[testFinished name='not allowed' duration="{duration}"]
 ##teamcity[testStarted name='not prints unscoped info from previous failures']
-Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='not prints unscoped info from previous failures' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='not prints unscoped info from previous failures' duration="{duration}"]
 ##teamcity[testStarted name='null strings']
 ##teamcity[testFinished name='null strings' duration="{duration}"]
@@ -828,10 +828,10 @@ Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD
 ##teamcity[testStarted name='print unscoped info if passing unscoped info is printed']
 ##teamcity[testFinished name='print unscoped info if passing unscoped info is printed' duration="{duration}"]
 ##teamcity[testStarted name='prints unscoped info on failure']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this SHOULD be seen"|n  "this SHOULD also be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='prints unscoped info on failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this SHOULD be seen"|n  "this SHOULD also be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='prints unscoped info on failure' duration="{duration}"]
 ##teamcity[testStarted name='prints unscoped info only for the first assertion']
-Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen only ONCE"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='prints unscoped info only for the first assertion' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen only ONCE"|n  CHECK( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='prints unscoped info only for the first assertion' duration="{duration}"]
 ##teamcity[testStarted name='random SECTION tests']
 ##teamcity[testFinished name='random SECTION tests' duration="{duration}"]
@@ -848,18 +848,18 @@ Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD
 ##teamcity[testStarted name='second tag']
 ##teamcity[testFinished name='second tag' duration="{duration}"]
 ##teamcity[testStarted name='send a single char to INFO']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "3"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='send a single char to INFO' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed with message:|n  "3"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='send a single char to INFO' duration="{duration}"]
 ##teamcity[testStarted name='sends information to INFO']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "hi"|n  "i := 7"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='sends information to INFO' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "hi"|n  "i := 7"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='sends information to INFO' duration="{duration}"]
 ##teamcity[testStarted name='shortened hide tags are split apart']
 ##teamcity[testFinished name='shortened hide tags are split apart' duration="{duration}"]
 ##teamcity[testStarted name='splitString']
 ##teamcity[testFinished name='splitString' duration="{duration}"]
 ##teamcity[testStarted name='stacks unscoped info in loops']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 1 to 3..."|n  "1"|n  "2"|n  "3"|n  CHECK( false )|nwith expansion:|n  false|n']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to 6..."|n  "4"|n  "5"|n  "6"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='stacks unscoped info in loops' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 1 to 3..."|n  "1"|n  "2"|n  "3"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='stacks unscoped info in loops' message='Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to 6..."|n  "4"|n  "5"|n  "6"|n  CHECK( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='stacks unscoped info in loops' duration="{duration}"]
 ##teamcity[testStarted name='startsWith']
 ##teamcity[testFinished name='startsWith' duration="{duration}"]
@@ -900,7 +900,7 @@ Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to
 ##teamcity[testStarted name='tags with dots in later positions are not parsed as hidden']
 ##teamcity[testFinished name='tags with dots in later positions are not parsed as hidden' duration="{duration}"]
 ##teamcity[testStarted name='thrown std::strings are translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "Why would you throw a std::string?"']
+##teamcity[testFailed name='thrown std::strings are translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "Why would you throw a std::string?"']
 ##teamcity[testFinished name='thrown std::strings are translated' duration="{duration}"]
 ##teamcity[testStarted name='toString on const wchar_t const pointer returns the string contents']
 ##teamcity[testFinished name='toString on const wchar_t const pointer returns the string contents' duration="{duration}"]
diff --git a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
index 2f539ced..52622a89 100644
--- a/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt
@@ -18,7 +18,7 @@
 ##teamcity[testStarted name='#1455 - INFO and WARN can start with a linebreak']
 ##teamcity[testFinished name='#1455 - INFO and WARN can start with a linebreak' duration="{duration}"]
 ##teamcity[testStarted name='#1514: stderr/stdout is not captured in tests aborted by an exception']
-Tricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
+##teamcity[testFailed name='#1514: stderr/stdout is not captured in tests aborted by an exception' message='Tricky.tests.cpp:<line number>|n...............................................................................|n|nTricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
 ##teamcity[testStdOut name='#1514: stderr/stdout is not captured in tests aborted by an exception' out='This would not be caught previously|n']
 ##teamcity[testStdErr name='#1514: stderr/stdout is not captured in tests aborted by an exception' out='Nor would this|n']
 ##teamcity[testFinished name='#1514: stderr/stdout is not captured in tests aborted by an exception' duration="{duration}"]
@@ -53,29 +53,29 @@ Tricky.tests.cpp:<line number>|nexplicit failure with message:|n  "1514"']
 ##teamcity[testStarted name='#2152 - ULP checks between differently signed values were wrong - float']
 ##teamcity[testFinished name='#2152 - ULP checks between differently signed values were wrong - float' duration="{duration}"]
 ##teamcity[testStarted name='#748 - captures with unexpected exceptions']
-Exception.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"- failure ignore as test marked as |'ok to fail|'|n']
-Exception.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"|n  REQUIRE_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#748 - captures with unexpected exceptions' message='-------------------------------------------------------------------------------|noutside assertions|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#748 - captures with unexpected exceptions' message='-------------------------------------------------------------------------------|ninside REQUIRE_NOTHROW|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with messages:|n  "answer := 42"|n  "expected exception"|n  REQUIRE_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='#748 - captures with unexpected exceptions' duration="{duration}"]
 ##teamcity[testStarted name='#809']
 ##teamcity[testFinished name='#809' duration="{duration}"]
 ##teamcity[testStarted name='#833']
 ##teamcity[testFinished name='#833' duration="{duration}"]
 ##teamcity[testStarted name='#835 -- errno should not be touched by Catch2']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( f() == 0 )|nwith expansion:|n  1 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='#835 -- errno should not be touched by Catch2' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( f() == 0 )|nwith expansion:|n  1 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='#835 -- errno should not be touched by Catch2' duration="{duration}"]
 ##teamcity[testStarted name='#872']
 ##teamcity[testFinished name='#872' duration="{duration}"]
 ##teamcity[testStarted name='#961 -- Dynamically created sections should all be reported']
 ##teamcity[testFinished name='#961 -- Dynamically created sections should all be reported' duration="{duration}"]
 ##teamcity[testStarted name='|'Not|' checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( false != false )|nwith expansion:|n  false != false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( true != true )|nwith expansion:|n  true != true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !true )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( true )|nwith expansion:|n  !true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !trueValue )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( trueValue )|nwith expansion:|n  !true|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !(1 == 1) )|nwith expansion:|n  false|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nwith expansion:|n  !(1 == 1)|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( false != false )|nwith expansion:|n  false != false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( true != true )|nwith expansion:|n  true != true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !true )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( true )|nwith expansion:|n  !true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !trueValue )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( trueValue )|nwith expansion:|n  !true|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( !(1 == 1) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='|'Not|' checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nwith expansion:|n  !(1 == 1)|n']
 ##teamcity[testFinished name='|'Not|' checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='|'Not|' checks that should succeed']
 ##teamcity[testFinished name='|'Not|' checks that should succeed' duration="{duration}"]
@@ -84,21 +84,21 @@ Condition.tests.cpp:<line number>|nexpression failed|n  CHECK_FALSE( 1 == 1 )|nw
 ##teamcity[testStarted name='3x3x3 ints']
 ##teamcity[testFinished name='3x3x3 ints' duration="{duration}"]
 ##teamcity[testStarted name='A METHOD_AS_TEST_CASE based test run that fails']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( s == "world" )|nwith expansion:|n  "hello" == "world"|n']
+##teamcity[testFailed name='A METHOD_AS_TEST_CASE based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( s == "world" )|nwith expansion:|n  "hello" == "world"|n']
 ##teamcity[testFinished name='A METHOD_AS_TEST_CASE based test run that fails' duration="{duration}"]
 ##teamcity[testStarted name='A METHOD_AS_TEST_CASE based test run that succeeds']
 ##teamcity[testFinished name='A METHOD_AS_TEST_CASE based test run that succeeds' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - Template_Foo<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<float>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>::m_a.size() == 1 )|nwith expansion:|n  0 == 1|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that fails - std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<float>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - Template_Foo<float>' duration="{duration}"]
@@ -109,16 +109,16 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD based test run that succeeds - std::vector<int>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<float, 6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - Template_Foo_2<int, 2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  6 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<float, 6>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
+##teamcity[testFailed name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<TestType>{}.m_a.size() < 2 )|nwith expansion:|n  2 < 2|n']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that fails - std::array<int, 2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<float,6>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - Template_Foo_2<float,6>' duration="{duration}"]
@@ -129,13 +129,13 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture_2<
 ##teamcity[testStarted name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>']
 ##teamcity[testFinished name='A TEMPLATE_PRODUCT_TEST_CASE_METHOD_SIG based test run that succeeds - std::array<int,2>' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - double' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0f == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1.0f == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - float' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<TestType>::m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that fails - int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - double' duration="{duration}"]
@@ -144,13 +144,13 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Template_Fixture<Te
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD based test run that succeeds - int' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 1' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  3 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  3 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 3' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  6 == 0|n']
+##teamcity[testFailed name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::value == 0 )|nwith expansion:|n  6 == 0|n']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that fails - 6' duration="{duration}"]
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 1' duration="{duration}"]
@@ -159,7 +159,7 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( Nttp_Fixture<V>::va
 ##teamcity[testStarted name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6']
 ##teamcity[testFinished name='A TEMPLATE_TEST_CASE_METHOD_SIG based test run that succeeds - 6' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that fails']
-Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='A TEST_CASE_METHOD based test run that fails' message='Class.tests.cpp:<line number>|n...............................................................................|n|nClass.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that fails' duration="{duration}"]
 ##teamcity[testStarted name='A TEST_CASE_METHOD based test run that succeeds']
 ##teamcity[testFinished name='A TEST_CASE_METHOD based test run that succeeds' duration="{duration}"]
@@ -182,11 +182,11 @@ Class.tests.cpp:<line number>|nexpression failed|n  REQUIRE( m_a == 2 )|nwith ex
 ##teamcity[testStarted name='A comparison that uses literals instead of the normal constructor']
 ##teamcity[testFinished name='A comparison that uses literals instead of the normal constructor' duration="{duration}"]
 ##teamcity[testStarted name='A couple of nested sections followed by a failure']
-Misc.tests.cpp:<line number>|nexplicit failure with message:|n  "to infinity and beyond"']
+##teamcity[testFailed name='A couple of nested sections followed by a failure' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure with message:|n  "to infinity and beyond"']
 ##teamcity[testFinished name='A couple of nested sections followed by a failure' duration="{duration}"]
 ##teamcity[testStarted name='A failing expression with a non streamable type is still captured']
-Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( &o1 == &o2 )|nwith expansion:|n  0x<hex digits> == 0x<hex digits>|n']
-Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith expansion:|n  {?} == {?}|n']
+##teamcity[testFailed name='A failing expression with a non streamable type is still captured' message='Tricky.tests.cpp:<line number>|n...............................................................................|n|nTricky.tests.cpp:<line number>|nexpression failed|n  CHECK( &o1 == &o2 )|nwith expansion:|n  0x<hex digits> == 0x<hex digits>|n']
+##teamcity[testFailed name='A failing expression with a non streamable type is still captured' message='Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith expansion:|n  {?} == {?}|n']
 ##teamcity[testFinished name='A failing expression with a non streamable type is still captured' duration="{duration}"]
 ##teamcity[testStarted name='Absolute margin']
 ##teamcity[testFinished name='Absolute margin' duration="{duration}"]
@@ -195,7 +195,7 @@ Tricky.tests.cpp:<line number>|nexpression failed|n  CHECK( o1 == o2 )|nwith exp
 ##teamcity[testStarted name='An expression with side-effects should only be evaluated once']
 ##teamcity[testFinished name='An expression with side-effects should only be evaluated once' duration="{duration}"]
 ##teamcity[testStarted name='An unchecked exception reports the line of the last assertion']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n']
+##teamcity[testFailed name='An unchecked exception reports the line of the last assertion' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"|n  {Unknown expression after the reported line}|nwith expansion:|n  {Unknown expression after the reported line}|n']
 ##teamcity[testFinished name='An unchecked exception reports the line of the last assertion' duration="{duration}"]
 ##teamcity[testStarted name='Anonymous test case 1']
 ##teamcity[testFinished name='Anonymous test case 1' duration="{duration}"]
@@ -276,21 +276,21 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpe
 ##teamcity[testStarted name='Composed matchers shortcircuit']
 ##teamcity[testFinished name='Composed matchers shortcircuit' duration="{duration}"]
 ##teamcity[testStarted name='Contains string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "not there" (case insensitive)|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "STRING" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "STRING"|n']
+##teamcity[testFailed name='Contains string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "not there", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "not there" (case insensitive)|n']
+##teamcity[testFailed name='Contains string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ContainsSubstring( "STRING" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" contains: "STRING"|n']
 ##teamcity[testFinished name='Contains string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Copy and then generate a range']
 ##teamcity[testFinished name='Copy and then generate a range' duration="{duration}"]
 ##teamcity[testStarted name='Cout stream properly declares it writes to stdout']
 ##teamcity[testFinished name='Cout stream properly declares it writes to stdout' duration="{duration}"]
 ##teamcity[testStarted name='Custom exceptions can be translated when testing for nothrow']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_NOTHROW( throwCustom() )|nwith expansion:|n  throwCustom()|n']
+##teamcity[testFailed name='Custom exceptions can be translated when testing for nothrow' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_NOTHROW( throwCustom() )|nwith expansion:|n  throwCustom()|n']
 ##teamcity[testFinished name='Custom exceptions can be translated when testing for nothrow' duration="{duration}"]
 ##teamcity[testStarted name='Custom exceptions can be translated when testing for throwing as something else']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_THROWS_AS( throwCustom(), std::exception )|nwith expansion:|n  throwCustom(), std::exception|n']
+##teamcity[testFailed name='Custom exceptions can be translated when testing for throwing as something else' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception - not std"|n  REQUIRE_THROWS_AS( throwCustom(), std::exception )|nwith expansion:|n  throwCustom(), std::exception|n']
 ##teamcity[testFinished name='Custom exceptions can be translated when testing for throwing as something else' duration="{duration}"]
 ##teamcity[testStarted name='Custom std-exceptions can be custom translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom std exception"']
+##teamcity[testFailed name='Custom std-exceptions can be custom translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom std exception"']
 ##teamcity[testFinished name='Custom std-exceptions can be custom translated' duration="{duration}"]
 ##teamcity[testStarted name='Default scale is invisible to comparison']
 ##teamcity[testFinished name='Default scale is invisible to comparison' duration="{duration}"]
@@ -301,8 +301,8 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom
 ##teamcity[testStarted name='Empty tag is not allowed']
 ##teamcity[testFinished name='Empty tag is not allowed' duration="{duration}"]
 ##teamcity[testStarted name='EndsWith string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
+##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "Substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "Substring"|n']
+##teamcity[testFailed name='EndsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ends with: "this" (case insensitive)|n']
 ##teamcity[testFinished name='EndsWith string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Enums can quickly have stringification enabled using REGISTER_ENUM']
 ##teamcity[testFinished name='Enums can quickly have stringification enabled using REGISTER_ENUM' duration="{duration}"]
@@ -311,37 +311,37 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStarted name='Epsilon only applies to Approx|'s value']
 ##teamcity[testFinished name='Epsilon only applies to Approx|'s value' duration="{duration}"]
 ##teamcity[testStarted name='Equality checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 6 )|nwith expansion:|n  7 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 8 )|nwith expansion:|n  7 == 8|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 0 )|nwith expansion:|n  7 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.11f ) )|nwith expansion:|n  9.1f == Approx( 9.1099996567 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.0f ) )|nwith expansion:|n  9.1f == Approx( 9.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 1 ) )|nwith expansion:|n  9.1f == Approx( 1.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 0 ) )|nwith expansion:|n  9.1f == Approx( 0.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi == Approx( 3.1415 ) )|nwith expansion:|n  3.1415926535 == Approx( 3.1415 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "goodbye" )|nwith expansion:|n  "hello" == "goodbye"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hell" )|nwith expansion:|n  "hello" == "hell"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hello1" )|nwith expansion:|n  "hello" == "hello1"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() == 6 )|nwith expansion:|n  5 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( x == Approx( 1.301 ) )|nwith expansion:|n  1.3 == Approx( 1.301 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 6 )|nwith expansion:|n  7 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 8 )|nwith expansion:|n  7 == 8|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven == 0 )|nwith expansion:|n  7 == 0|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.11f ) )|nwith expansion:|n  9.1f == Approx( 9.1099996567 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 9.0f ) )|nwith expansion:|n  9.1f == Approx( 9.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 1 ) )|nwith expansion:|n  9.1f == Approx( 1.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one == Approx( 0 ) )|nwith expansion:|n  9.1f == Approx( 0.0 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi == Approx( 3.1415 ) )|nwith expansion:|n  3.1415926535 == Approx( 3.1415 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "goodbye" )|nwith expansion:|n  "hello" == "goodbye"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hell" )|nwith expansion:|n  "hello" == "hell"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello == "hello1" )|nwith expansion:|n  "hello" == "hello1"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() == 6 )|nwith expansion:|n  5 == 6|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Equality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( x == Approx( 1.301 ) )|nwith expansion:|n  1.3 == Approx( 1.301 )|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Equality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Equality checks that should succeed']
 ##teamcity[testFinished name='Equality checks that should succeed' duration="{duration}"]
 ##teamcity[testStarted name='Equals']
 ##teamcity[testFinished name='Equals' duration="{duration}"]
 ##teamcity[testStarted name='Equals string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "this string contains |'ABC|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "this string contains |'ABC|' as a substring"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "something else" (case insensitive)|n']
+##teamcity[testFailed name='Equals string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "this string contains |'ABC|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "this string contains |'ABC|' as a substring"|n']
+##teamcity[testFailed name='Equals string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" equals: "something else" (case insensitive)|n']
 ##teamcity[testFinished name='Equals string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified']
 ##teamcity[testFinished name='Exception as a value (e.g. in REQUIRE_THROWS_MATCHES) can be stringified' duration="{duration}"]
 ##teamcity[testStarted name='Exception matchers that fail']
-Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  CHECK_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  REQUIRE_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THROWS_MATCHES( throwsSpecialException( 3 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nNo exception|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nno exception was thrown where one was expected|n  REQUIRE_THROWS_MATCHES( doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  doesNotThrow(), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nType mismatch|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  CHECK_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nunexpected exception with message:|n  "Unknown exception"|n  REQUIRE_THROWS_MATCHES( throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  throwsAsInt( 1 ), SpecialException, ExceptionMatcher{ 1 }|n']
+##teamcity[testFailed name='Exception matchers that fail' message='-------------------------------------------------------------------------------|nContents are wrong|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THROWS_MATCHES( throwsSpecialException( 3 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
+##teamcity[testFailed name='Exception matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( throwsSpecialException( 4 ), SpecialException, ExceptionMatcher{ 1 } )|nwith expansion:|n  SpecialException::what special exception has value of 1|n']
 ##teamcity[testFinished name='Exception matchers that fail' duration="{duration}"]
 ##teamcity[testStarted name='Exception matchers that succeed']
 ##teamcity[testFinished name='Exception matchers that succeed' duration="{duration}"]
@@ -352,18 +352,18 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_MATCHES( t
 ##teamcity[testStarted name='Exceptions matchers']
 ##teamcity[testFinished name='Exceptions matchers' duration="{duration}"]
 ##teamcity[testStarted name='Expected exceptions that don|'t throw or unexpected exceptions fail the test']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_THROWS_AS( thisThrows(), std::string )|nwith expansion:|n  thisThrows(), std::string|n']
-Exception.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )|nwith expansion:|n  thisDoesntThrow(), std::domain_error|n']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_THROWS_AS( thisThrows(), std::string )|nwith expansion:|n  thisThrows(), std::string|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|nno exception was thrown where one was expected|n  CHECK_THROWS_AS( thisDoesntThrow(), std::domain_error )|nwith expansion:|n  thisDoesntThrow(), std::domain_error|n']
+##teamcity[testFailed name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' message='Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK_NOTHROW( thisThrows() )|nwith expansion:|n  thisThrows()|n']
 ##teamcity[testFinished name='Expected exceptions that don|'t throw or unexpected exceptions fail the test' duration="{duration}"]
 ##teamcity[testStarted name='FAIL aborts the test']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
+##teamcity[testFailed name='FAIL aborts the test' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
 ##teamcity[testFinished name='FAIL aborts the test' duration="{duration}"]
 ##teamcity[testStarted name='FAIL does not require an argument']
-Message.tests.cpp:<line number>|nexplicit failure']
+##teamcity[testFailed name='FAIL does not require an argument' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure']
 ##teamcity[testFinished name='FAIL does not require an argument' duration="{duration}"]
 ##teamcity[testStarted name='FAIL_CHECK does not abort the test']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
+##teamcity[testFailed name='FAIL_CHECK does not abort the test' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a failure"']
 ##teamcity[testFinished name='FAIL_CHECK does not abort the test' duration="{duration}"]
 ##teamcity[testStarted name='Factorials are computed']
 ##teamcity[testFinished name='Factorials are computed' duration="{duration}"]
@@ -390,21 +390,21 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "This is a fa
 ##teamcity[testStarted name='INFO and WARN do not abort tests']
 ##teamcity[testFinished name='INFO and WARN do not abort tests' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message should be logged"|n  "so should this"|n  REQUIRE( a == 1 )|nwith expansion:|n  2 == 1|n']
+##teamcity[testFailed name='INFO gets logged on failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this message should be logged"|n  "so should this"|n  REQUIRE( a == 1 )|nwith expansion:|n  2 == 1|n']
 ##teamcity[testFinished name='INFO gets logged on failure' duration="{duration}"]
 ##teamcity[testStarted name='INFO gets logged on failure, even if captured before successful assertions']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  CHECK( a == 1 )|nwith expansion:|n  2 == 1|n']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  "and this, but later"|n  CHECK( a == 0 )|nwith expansion:|n  2 == 0|n']
+##teamcity[testFailed name='INFO gets logged on failure, even if captured before successful assertions' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  CHECK( a == 1 )|nwith expansion:|n  2 == 1|n']
+##teamcity[testFailed name='INFO gets logged on failure, even if captured before successful assertions' message='Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this message may be logged later"|n  "this message should be logged"|n  "and this, but later"|n  CHECK( a == 0 )|nwith expansion:|n  2 == 0|n']
 ##teamcity[testFinished name='INFO gets logged on failure, even if captured before successful assertions' duration="{duration}"]
 ##teamcity[testStarted name='INFO is reset for each loop']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
+##teamcity[testFailed name='INFO is reset for each loop' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "current counter 10"|n  "i := 10"|n  REQUIRE( i < 10 )|nwith expansion:|n  10 < 10|n']
 ##teamcity[testFinished name='INFO is reset for each loop' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi != Approx( 3.1415926535 ) )|nwith expansion:|n  3.1415926535 != Approx( 3.1415926535 )|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello != "hello" )|nwith expansion:|n  "hello" != "hello"|n- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() != 5 )|nwith expansion:|n  5 != 5|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven != 7 )|nwith expansion:|n  7 != 7|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one != Approx( 9.1f ) )|nwith expansion:|n  9.1f != Approx( 9.1000003815 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.double_pi != Approx( 3.1415926535 ) )|nwith expansion:|n  3.1415926535 != Approx( 3.1415926535 )|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello != "hello" )|nwith expansion:|n  "hello" != "hello"|n- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Inequality checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.size() != 5 )|nwith expansion:|n  5 != 5|n- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Inequality checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Inequality checks that should succeed']
 ##teamcity[testFinished name='Inequality checks that should succeed' duration="{duration}"]
@@ -421,21 +421,21 @@ Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello.si
 ##teamcity[testStarted name='Matchers can be composed with both && and ||||']
 ##teamcity[testFinished name='Matchers can be composed with both && and ||||' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be composed with both && and |||| - failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) |||| ContainsSubstring( "different" ) ) && ContainsSubstring( "random" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )|n']
+##teamcity[testFailed name='Matchers can be composed with both && and |||| - failing' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), ( ContainsSubstring( "string" ) |||| ContainsSubstring( "different" ) ) && ContainsSubstring( "random" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" ( ( contains: "string" or contains: "different" ) and contains: "random" )|n']
 ##teamcity[testFinished name='Matchers can be composed with both && and |||| - failing' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be negated (Not) with the ! operator']
 ##teamcity[testFinished name='Matchers can be negated (Not) with the ! operator' duration="{duration}"]
 ##teamcity[testStarted name='Matchers can be negated (Not) with the ! operator - failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), !ContainsSubstring( "substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" not contains: "substring"|n']
+##teamcity[testFailed name='Matchers can be negated (Not) with the ! operator - failing' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), !ContainsSubstring( "substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" not contains: "substring"|n']
 ##teamcity[testFinished name='Matchers can be negated (Not) with the ! operator - failing' duration="{duration}"]
 ##teamcity[testStarted name='Mayfail test case with nested sections']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
-Condition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nA|n1|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nA|n2|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nB|n1|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Mayfail test case with nested sections' message='-------------------------------------------------------------------------------|nB|n2|n-------------------------------------------------------------------------------|nCondition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Mayfail test case with nested sections' duration="{duration}"]
 ##teamcity[testStarted name='Mismatching exception messages failing the test']
-Exception.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )|nwith expansion:|n  "expected exception" equals: "should fail"|n']
+##teamcity[testFailed name='Mismatching exception messages failing the test' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thisThrows(), "should fail" )|nwith expansion:|n  "expected exception" equals: "should fail"|n']
 ##teamcity[testFinished name='Mismatching exception messages failing the test' duration="{duration}"]
 ##teamcity[testStarted name='Multireporter calls reporters and listeners in correct order']
 ##teamcity[testFinished name='Multireporter calls reporters and listeners in correct order' duration="{duration}"]
@@ -446,40 +446,40 @@ Exception.tests.cpp:<line number>|nexpression failed|n  REQUIRE_THROWS_WITH( thi
 ##teamcity[testStarted name='Nice descriptive name']
 ##teamcity[testFinished name='Nice descriptive name' duration="{duration}"]
 ##teamcity[testStarted name='Non-std exceptions can be translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception"']
+##teamcity[testFailed name='Non-std exceptions can be translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "custom exception"']
 ##teamcity[testFinished name='Non-std exceptions can be translated' duration="{duration}"]
 ##teamcity[testStarted name='Objects that evaluated in boolean contexts can be checked']
 ##teamcity[testFinished name='Objects that evaluated in boolean contexts can be checked' duration="{duration}"]
 ##teamcity[testStarted name='Optionally static assertions']
 ##teamcity[testFinished name='Optionally static assertions' duration="{duration}"]
 ##teamcity[testStarted name='Ordering comparison checks that should fail']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 7 )|nwith expansion:|n  7 > 7|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 7 )|nwith expansion:|n  7 < 7|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 8 )|nwith expansion:|n  7 > 8|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 6 )|nwith expansion:|n  7 < 6|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 0 )|nwith expansion:|n  7 < 0|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < -1 )|nwith expansion:|n  7 < -1|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven >= 8 )|nwith expansion:|n  7 >= 8|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven <= 6 )|nwith expansion:|n  7 <= 6|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one < 9 )|nwith expansion:|n  9.1f < 9|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 10 )|nwith expansion:|n  9.1f > 10|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 9.2 )|nwith expansion:|n  9.1f > 9.2|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hello" )|nwith expansion:|n  "hello" > "hello"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hello" )|nwith expansion:|n  "hello" < "hello"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hellp" )|nwith expansion:|n  "hello" > "hellp"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "z" )|nwith expansion:|n  "hello" > "z"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hellm" )|nwith expansion:|n  "hello" < "hellm"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "a" )|nwith expansion:|n  "hello" < "a"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello >= "z" )|nwith expansion:|n  "hello" >= "z"|n']
-Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello <= "a" )|nwith expansion:|n  "hello" <= "a"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|n...............................................................................|n|nCondition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 7 )|nwith expansion:|n  7 > 7|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 7 )|nwith expansion:|n  7 < 7|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven > 8 )|nwith expansion:|n  7 > 8|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 6 )|nwith expansion:|n  7 < 6|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < 0 )|nwith expansion:|n  7 < 0|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven < -1 )|nwith expansion:|n  7 < -1|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven >= 8 )|nwith expansion:|n  7 >= 8|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.int_seven <= 6 )|nwith expansion:|n  7 <= 6|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one < 9 )|nwith expansion:|n  9.1f < 9|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 10 )|nwith expansion:|n  9.1f > 10|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.float_nine_point_one > 9.2 )|nwith expansion:|n  9.1f > 9.2|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hello" )|nwith expansion:|n  "hello" > "hello"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hello" )|nwith expansion:|n  "hello" < "hello"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "hellp" )|nwith expansion:|n  "hello" > "hellp"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello > "z" )|nwith expansion:|n  "hello" > "z"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "hellm" )|nwith expansion:|n  "hello" < "hellm"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello < "a" )|nwith expansion:|n  "hello" < "a"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello >= "z" )|nwith expansion:|n  "hello" >= "z"|n']
+##teamcity[testFailed name='Ordering comparison checks that should fail' message='Condition.tests.cpp:<line number>|nexpression failed|n  CHECK( data.str_hello <= "a" )|nwith expansion:|n  "hello" <= "a"|n']
 ##teamcity[testFinished name='Ordering comparison checks that should fail' duration="{duration}"]
 ##teamcity[testStarted name='Ordering comparison checks that should succeed']
 ##teamcity[testFinished name='Ordering comparison checks that should succeed' duration="{duration}"]
 ##teamcity[testStarted name='Our PCG implementation provides expected results for known seeds']
 ##teamcity[testFinished name='Our PCG implementation provides expected results for known seeds' duration="{duration}"]
 ##teamcity[testStarted name='Output from all sections is reported']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section one"']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section two"']
+##teamcity[testFailed name='Output from all sections is reported' message='-------------------------------------------------------------------------------|none|n-------------------------------------------------------------------------------|nMessage.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section one"']
+##teamcity[testFailed name='Output from all sections is reported' message='-------------------------------------------------------------------------------|ntwo|n-------------------------------------------------------------------------------|nMessage.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from section two"']
 ##teamcity[testFinished name='Output from all sections is reported' duration="{duration}"]
 ##teamcity[testStarted name='Overloaded comma or address-of operators are not used']
 ##teamcity[testFinished name='Overloaded comma or address-of operators are not used' duration="{duration}"]
@@ -514,12 +514,12 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Message from
 ##teamcity[testStarted name='Range type with sentinel']
 ##teamcity[testFinished name='Range type with sentinel' duration="{duration}"]
 ##teamcity[testStarted name='Reconstruction should be based on stringification: #914']
-Decomposition.tests.cpp:<line number>|nexpression failed|n  CHECK( truthy(false) )|nwith expansion:|n  Hey, its truthy!|n']
+##teamcity[testFailed name='Reconstruction should be based on stringification: #914' message='Decomposition.tests.cpp:<line number>|n...............................................................................|n|nDecomposition.tests.cpp:<line number>|nexpression failed|n  CHECK( truthy(false) )|nwith expansion:|n  Hey, its truthy!|n']
 ##teamcity[testFinished name='Reconstruction should be based on stringification: #914' duration="{duration}"]
 ##teamcity[testStarted name='Regex string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this STRING contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this STRING contains |'abc|' as a substring" case sensitively|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "contains |'abc|' as a substring" case sensitively|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this string contains |'abc|' as a" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this string contains |'abc|' as a" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this STRING contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this STRING contains |'abc|' as a substring" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "contains |'abc|' as a substring" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "contains |'abc|' as a substring" case sensitively|n']
+##teamcity[testFailed name='Regex string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), Matches( "this string contains |'abc|' as a" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" matches "this string contains |'abc|' as a" case sensitively|n']
 ##teamcity[testFinished name='Regex string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Registering reporter with |'::|' in name fails']
 ##teamcity[testFinished name='Registering reporter with |'::|' in name fails' duration="{duration}"]
@@ -551,8 +551,8 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStdOut name='Standard output from all sections is reported' out='Message from section one|nMessage from section two|n']
 ##teamcity[testFinished name='Standard output from all sections is reported' duration="{duration}"]
 ##teamcity[testStarted name='StartsWith string matcher']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "This String"|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "string" (case insensitive)|n']
+##teamcity[testFailed name='StartsWith string matcher' message='Matchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "This String" ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "This String"|n']
+##teamcity[testFailed name='StartsWith string matcher' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) )|nwith expansion:|n  "this string contains |'abc|' as a substring" starts with: "string" (case insensitive)|n']
 ##teamcity[testFinished name='StartsWith string matcher' duration="{duration}"]
 ##teamcity[testStarted name='Static arrays are convertible to string']
 ##teamcity[testFinished name='Static arrays are convertible to string' duration="{duration}"]
@@ -575,7 +575,7 @@ Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( testStringFor
 ##teamcity[testStarted name='Stringifying std::chrono::time_point<system_clock>']
 ##teamcity[testFinished name='Stringifying std::chrono::time_point<system_clock>' duration="{duration}"]
 ##teamcity[testStarted name='Tabs and newlines show in output']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expansion:|n  "if ($b == 10) {|n		$a	= 20;|n}"|n==|n"if ($b == 10) {|n	$a = 20;|n}|n"|n']
+##teamcity[testFailed name='Tabs and newlines show in output' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expansion:|n  "if ($b == 10) {|n		$a	= 20;|n}"|n==|n"if ($b == 10) {|n	$a = 20;|n}|n"|n']
 ##teamcity[testFinished name='Tabs and newlines show in output' duration="{duration}"]
 ##teamcity[testStarted name='Tag alias can be registered against tag patterns']
 ##teamcity[testFinished name='Tag alias can be registered against tag patterns' duration="{duration}"]
@@ -628,10 +628,10 @@ Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( s1 == s2 )|nwith expan
 ##teamcity[testStarted name='Testing checked-if']
 ##teamcity[testFinished name='Testing checked-if' duration="{duration}"]
 ##teamcity[testStarted name='Testing checked-if 2']
-Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Testing checked-if 2' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 2' duration="{duration}"]
 ##teamcity[testStarted name='Testing checked-if 3']
-Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
+##teamcity[testIgnored name='Testing checked-if 3' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as |'ok to fail|'|n']
 ##teamcity[testFinished name='Testing checked-if 3' duration="{duration}"]
 ##teamcity[testStarted name='The NO_FAIL macro reports a failure but does not fail the test']
 ##teamcity[testFinished name='The NO_FAIL macro reports a failure but does not fail the test' duration="{duration}"]
@@ -640,14 +640,14 @@ Misc.tests.cpp:<line number>|nexplicit failure- failure ignore as test marked as
 ##teamcity[testStarted name='This test |'should|' fail but doesn|'t']
 ##teamcity[testFinished name='This test |'should|' fail but doesn|'t' duration="{duration}"]
 ##teamcity[testStarted name='Thrown string literals are translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "For some reason someone is throwing a string literal!"']
+##teamcity[testFailed name='Thrown string literals are translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "For some reason someone is throwing a string literal!"']
 ##teamcity[testFinished name='Thrown string literals are translated' duration="{duration}"]
 ##teamcity[testStarted name='Tracker']
 ##teamcity[testFinished name='Tracker' duration="{duration}"]
 ##teamcity[testStarted name='Trim strings']
 ##teamcity[testFinished name='Trim strings' duration="{duration}"]
 ##teamcity[testStarted name='Unexpected exceptions can be translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"']
+##teamcity[testFailed name='Unexpected exceptions can be translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"']
 ##teamcity[testFinished name='Unexpected exceptions can be translated' duration="{duration}"]
 ##teamcity[testStarted name='Upcasting special member functions']
 ##teamcity[testFinished name='Upcasting special member functions' duration="{duration}"]
@@ -672,41 +672,41 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "3.14"'
 ##teamcity[testStarted name='Vector Approx matcher']
 ##teamcity[testFinished name='Vector Approx matcher' duration="{duration}"]
 ##teamcity[testStarted name='Vector Approx matcher -- failing']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Approx( t1 ) )|nwith expansion:|n  {  } is approx: { 1.0, 2.0 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v1, Approx( v2 ) )|nwith expansion:|n  { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }|n']
+##teamcity[testFailed name='Vector Approx matcher -- failing' message='-------------------------------------------------------------------------------|nEmpty and non empty vectors are not approx equal|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Approx( t1 ) )|nwith expansion:|n  {  } is approx: { 1.0, 2.0 }|n']
+##teamcity[testFailed name='Vector Approx matcher -- failing' message='-------------------------------------------------------------------------------|nJust different vectors|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v1, Approx( v2 ) )|nwith expansion:|n  { 2.0, 4.0, 6.0 } is approx: { 1.0, 3.0, 5.0 }|n']
 ##teamcity[testFinished name='Vector Approx matcher -- failing' duration="{duration}"]
 ##teamcity[testStarted name='Vector matchers']
 ##teamcity[testFinished name='Vector matchers' duration="{duration}"]
 ##teamcity[testStarted name='Vector matchers that fail']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, VectorContains( -1 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: -1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, VectorContains( 1 ) )|nwith expansion:|n  {  } Contains: 1|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Contains( v ) )|nwith expansion:|n  {  } Contains: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Contains( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: { 1, 2, 4 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Equals: { 1, 2 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v2, Equals( v ) )|nwith expansion:|n  { 1, 2 } Equals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Equals( v ) )|nwith expansion:|n  {  } Equals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( empty ) )|nwith expansion:|n  { 1, 2, 3 } Equals: {  }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, UnorderedEquals( empty ) )|nwith expansion:|n  { 1, 2, 3 } UnorderedEquals: {  }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, UnorderedEquals( v ) )|nwith expansion:|n  {  } UnorderedEquals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 1, 3 } UnorderedEquals: { 1, 2, 3 }|n']
-Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 3, 1 } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nContains (element)|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, VectorContains( -1 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: -1|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, VectorContains( 1 ) )|nwith expansion:|n  {  } Contains: 1|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nContains (vector)|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Contains( v ) )|nwith expansion:|n  {  } Contains: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Contains( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Contains: { 1, 2, 4 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nEquals|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( v2 ) )|nwith expansion:|n  { 1, 2, 3 } Equals: { 1, 2 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v2, Equals( v ) )|nwith expansion:|n  { 1, 2 } Equals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, Equals( v ) )|nwith expansion:|n  {  } Equals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, Equals( empty ) )|nwith expansion:|n  { 1, 2, 3 } Equals: {  }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='-------------------------------------------------------------------------------|nUnorderedEquals|n-------------------------------------------------------------------------------|nMatchers.tests.cpp:<line number>|n...............................................................................|n|nMatchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( v, UnorderedEquals( empty ) )|nwith expansion:|n  { 1, 2, 3 } UnorderedEquals: {  }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( empty, UnorderedEquals( v ) )|nwith expansion:|n  {  } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 1, 3 } UnorderedEquals: { 1, 2, 3 }|n']
+##teamcity[testFailed name='Vector matchers that fail' message='Matchers.tests.cpp:<line number>|nexpression failed|n  CHECK_THAT( permuted, UnorderedEquals( v ) )|nwith expansion:|n  { 3, 1 } UnorderedEquals: { 1, 2, 3 }|n']
 ##teamcity[testFinished name='Vector matchers that fail' duration="{duration}"]
 ##teamcity[testStarted name='When checked exceptions are thrown they can be expected or unexpected']
 ##teamcity[testFinished name='When checked exceptions are thrown they can be expected or unexpected' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown directly they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
+##teamcity[testFailed name='When unchecked exceptions are thrown directly they are always failures' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
 ##teamcity[testFinished name='When unchecked exceptions are thrown directly they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown during a CHECK the test should continue']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown during a CHECK the test should continue' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown during a CHECK the test should continue' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  REQUIRE( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  REQUIRE( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown during a REQUIRE the test should abort fail' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown from functions they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
+##teamcity[testFailed name='When unchecked exceptions are thrown from functions they are always failures' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "expected exception"|n  CHECK( thisThrows() == 0 )|nwith expansion:|n  thisThrows() == 0|n']
 ##teamcity[testFinished name='When unchecked exceptions are thrown from functions they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown from sections they are always failures']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
+##teamcity[testFailed name='When unchecked exceptions are thrown from sections they are always failures' message='-------------------------------------------------------------------------------|nsection name|n-------------------------------------------------------------------------------|nException.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpected exception"']
 ##teamcity[testFinished name='When unchecked exceptions are thrown from sections they are always failures' duration="{duration}"]
 ##teamcity[testStarted name='When unchecked exceptions are thrown, but caught, they do not affect the test']
 ##teamcity[testFinished name='When unchecked exceptions are thrown, but caught, they do not affect the test' duration="{duration}"]
@@ -733,12 +733,12 @@ Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "unexpe
 ##teamcity[testStarted name='checkedElse']
 ##teamcity[testFinished name='checkedElse' duration="{duration}"]
 ##teamcity[testStarted name='checkedElse, failing']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedElse( false ) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='checkedElse, failing' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedElse( false ) )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='checkedElse, failing' duration="{duration}"]
 ##teamcity[testStarted name='checkedIf']
 ##teamcity[testFinished name='checkedIf' duration="{duration}"]
 ##teamcity[testStarted name='checkedIf, failing']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedIf( false ) )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='checkedIf, failing' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedIf( false ) )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='checkedIf, failing' duration="{duration}"]
 ##teamcity[testStarted name='classify_outliers']
 ##teamcity[testFinished name='classify_outliers' duration="{duration}"]
@@ -763,10 +763,10 @@ Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( testCheckedIf( false
 ##teamcity[testStarted name='is_unary_function']
 ##teamcity[testFinished name='is_unary_function' duration="{duration}"]
 ##teamcity[testStarted name='just failure']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "Previous info should not be seen"']
+##teamcity[testFailed name='just failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "Previous info should not be seen"']
 ##teamcity[testFinished name='just failure' duration="{duration}"]
 ##teamcity[testStarted name='just failure after unscoped info']
-Message.tests.cpp:<line number>|nexplicit failure with message:|n  "previous unscoped info SHOULD not be seen"']
+##teamcity[testFailed name='just failure after unscoped info' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexplicit failure with message:|n  "previous unscoped info SHOULD not be seen"']
 ##teamcity[testFinished name='just failure after unscoped info' duration="{duration}"]
 ##teamcity[testStarted name='just info']
 ##teamcity[testFinished name='just info' duration="{duration}"]
@@ -775,16 +775,16 @@ Message.tests.cpp:<line number>|nexplicit failure with message:|n  "previous uns
 ##teamcity[testStarted name='long long']
 ##teamcity[testFinished name='long long' duration="{duration}"]
 ##teamcity[testStarted name='looped SECTION tests']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  0 > 1|n']
-Misc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  1 > 1|n']
+##teamcity[testFailed name='looped SECTION tests' message='-------------------------------------------------------------------------------|nb is currently: 0|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  0 > 1|n']
+##teamcity[testFailed name='looped SECTION tests' message='-------------------------------------------------------------------------------|nb is currently: 1|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  CHECK( b > a )|nwith expansion:|n  1 > 1|n']
 ##teamcity[testFinished name='looped SECTION tests' duration="{duration}"]
 ##teamcity[testStarted name='looped tests']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[0|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[1|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[3|] (3) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[4|] (5) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[6|] (13) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[7|] (21) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[0|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[1|] (1) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[3|] (3) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[4|] (5) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[6|] (13) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
+##teamcity[testFailed name='looped tests' message='Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib|[7|] (21) is even"|n  CHECK( ( fib|[i|] % 2 ) == 0 )|nwith expansion:|n  1 == 0|n']
 ##teamcity[testFinished name='looped tests' duration="{duration}"]
 ##teamcity[testStarted name='makeStream recognizes %debug stream name']
 ##teamcity[testFinished name='makeStream recognizes %debug stream name' duration="{duration}"]
@@ -797,7 +797,7 @@ Misc.tests.cpp:<line number>|nexpression failed with message:|n  "Testing if fib
 ##teamcity[testStarted name='mix info, unscoped info and warning']
 ##teamcity[testFinished name='mix info, unscoped info and warning' duration="{duration}"]
 ##teamcity[testStarted name='more nested SECTION tests']
-Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expansion:|n  1 == 2|n']
+##teamcity[testFailed name='more nested SECTION tests' message='-------------------------------------------------------------------------------|ndoesn|'t equal|nequal|n-------------------------------------------------------------------------------|nMisc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expansion:|n  1 == 2|n']
 ##teamcity[testFinished name='more nested SECTION tests' duration="{duration}"]
 ##teamcity[testStarted name='nested SECTION tests']
 ##teamcity[testFinished name='nested SECTION tests' duration="{duration}"]
@@ -812,7 +812,7 @@ Misc.tests.cpp:<line number>|nexpression failed|n  REQUIRE( a == b )|nwith expan
 ##teamcity[testStarted name='not allowed']
 ##teamcity[testFinished name='not allowed' duration="{duration}"]
 ##teamcity[testStarted name='not prints unscoped info from previous failures']
-Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='not prints unscoped info from previous failures' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='not prints unscoped info from previous failures' duration="{duration}"]
 ##teamcity[testStarted name='null strings']
 ##teamcity[testFinished name='null strings' duration="{duration}"]
@@ -827,10 +827,10 @@ Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD
 ##teamcity[testStarted name='print unscoped info if passing unscoped info is printed']
 ##teamcity[testFinished name='print unscoped info if passing unscoped info is printed' duration="{duration}"]
 ##teamcity[testStarted name='prints unscoped info on failure']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "this SHOULD be seen"|n  "this SHOULD also be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='prints unscoped info on failure' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "this SHOULD be seen"|n  "this SHOULD also be seen"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='prints unscoped info on failure' duration="{duration}"]
 ##teamcity[testStarted name='prints unscoped info only for the first assertion']
-Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen only ONCE"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='prints unscoped info only for the first assertion' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD be seen only ONCE"|n  CHECK( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='prints unscoped info only for the first assertion' duration="{duration}"]
 ##teamcity[testStarted name='random SECTION tests']
 ##teamcity[testFinished name='random SECTION tests' duration="{duration}"]
@@ -847,18 +847,18 @@ Message.tests.cpp:<line number>|nexpression failed with message:|n  "this SHOULD
 ##teamcity[testStarted name='second tag']
 ##teamcity[testFinished name='second tag' duration="{duration}"]
 ##teamcity[testStarted name='send a single char to INFO']
-Misc.tests.cpp:<line number>|nexpression failed with message:|n  "3"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='send a single char to INFO' message='Misc.tests.cpp:<line number>|n...............................................................................|n|nMisc.tests.cpp:<line number>|nexpression failed with message:|n  "3"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='send a single char to INFO' duration="{duration}"]
 ##teamcity[testStarted name='sends information to INFO']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "hi"|n  "i := 7"|n  REQUIRE( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='sends information to INFO' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "hi"|n  "i := 7"|n  REQUIRE( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='sends information to INFO' duration="{duration}"]
 ##teamcity[testStarted name='shortened hide tags are split apart']
 ##teamcity[testFinished name='shortened hide tags are split apart' duration="{duration}"]
 ##teamcity[testStarted name='splitString']
 ##teamcity[testFinished name='splitString' duration="{duration}"]
 ##teamcity[testStarted name='stacks unscoped info in loops']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 1 to 3..."|n  "1"|n  "2"|n  "3"|n  CHECK( false )|nwith expansion:|n  false|n']
-Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to 6..."|n  "4"|n  "5"|n  "6"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='stacks unscoped info in loops' message='Message.tests.cpp:<line number>|n...............................................................................|n|nMessage.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 1 to 3..."|n  "1"|n  "2"|n  "3"|n  CHECK( false )|nwith expansion:|n  false|n']
+##teamcity[testFailed name='stacks unscoped info in loops' message='Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to 6..."|n  "4"|n  "5"|n  "6"|n  CHECK( false )|nwith expansion:|n  false|n']
 ##teamcity[testFinished name='stacks unscoped info in loops' duration="{duration}"]
 ##teamcity[testStarted name='startsWith']
 ##teamcity[testFinished name='startsWith' duration="{duration}"]
@@ -899,7 +899,7 @@ Message.tests.cpp:<line number>|nexpression failed with messages:|n  "Count 4 to
 ##teamcity[testStarted name='tags with dots in later positions are not parsed as hidden']
 ##teamcity[testFinished name='tags with dots in later positions are not parsed as hidden' duration="{duration}"]
 ##teamcity[testStarted name='thrown std::strings are translated']
-Exception.tests.cpp:<line number>|nunexpected exception with message:|n  "Why would you throw a std::string?"']
+##teamcity[testFailed name='thrown std::strings are translated' message='Exception.tests.cpp:<line number>|n...............................................................................|n|nException.tests.cpp:<line number>|nunexpected exception with message:|n  "Why would you throw a std::string?"']
 ##teamcity[testFinished name='thrown std::strings are translated' duration="{duration}"]
 ##teamcity[testStarted name='toString on const wchar_t const pointer returns the string contents']
 ##teamcity[testFinished name='toString on const wchar_t const pointer returns the string contents' duration="{duration}"]
diff --git a/tools/scripts/approvalTests.py b/tools/scripts/approvalTests.py
index 592be36e..4146b646 100755
--- a/tools/scripts/approvalTests.py
+++ b/tools/scripts/approvalTests.py
@@ -48,11 +48,11 @@ def get_unapprovedResultsPath(baseName):
 
 langFilenameParser = re.compile(r'(.+\.[ch]pp)')
 filelocParser = re.compile(r'''
-    .*/
-    (.+\.[ch]pp)  # filename
-    (?::|\()      # : is starting separator between filename and line number on Linux, ( on Windows
-    ([0-9]*)      # line number
-    \)?           # Windows also has an ending separator, )
+    (?P<path_prefix>tests/SelfTest/(?:\w+/)*)  # We separate prefix and fname, so that
+    (?P<filename>\w+\.tests\.[ch]pp)           # we can keep only filename
+    (?::|\()                                   # Linux has : as separator between fname and line number, Windows uses (
+    (\d*)                                      # line number
+    \)?                                        # Windows also uses an ending separator, )
 ''', re.VERBOSE)
 lineNumberParser = re.compile(r' line="[0-9]*"')
 hexParser = re.compile(r'\b(0[xX][0-9a-fA-F]+)\b')
@@ -119,14 +119,11 @@ def filterLine(line, isCompact):
     line = normalizeFilepath(line)
 
     # strip source line numbers
-    m = filelocParser.match(line)
-    if m:
-        # note that this also strips directories, leaving only the filename
-        filename, lnum = m.groups()
-        lnum = ":<line number>" if lnum else ""
-        line = filename + lnum + line[m.end():]
-    else:
-        line = lineNumberParser.sub(" ", line)
+    # Note that this parser assumes an already normalized filepath from above,
+    # and might break terribly if it is moved around before the normalization.
+    line = filelocParser.sub('\g<filename>:<line number>', line)
+
+    line = lineNumberParser.sub(" ", line)
 
     if isCompact:
         line = line.replace(': FAILED', ': failed')