Added [!mayfail] tag to indicate test case that can fail without failing the suite.

Overhauled the summary report (including the expected failure count)

include/internal/catch_console_colour.hpp

@@ -37,8 +37,10 @@ namespace Catch {
 
             // By intention
             FileName = LightGrey,
+            Warning = Yellow,
             ResultError = BrightRed,
             ResultSuccess = BrightGreen,
+            ResultExpectedFailure = Warning,
 
             Error = BrightRed,
             Success = Green,
@@ -62,6 +64,8 @@ namespace Catch {
         static Detail::IColourImpl* impl();
     };
 
+    inline std::ostream& operator << ( std::ostream& os, Colour const& ) { return os; }
+
 } // end namespace Catch
 
 #endif // TWOBLUECUBES_CATCH_CONSOLE_COLOUR_HPP_INCLUDED

include/internal/catch_list.hpp

@@ -41,7 +41,7 @@ namespace Catch {
                 ++it ) {
             matchedTests++;
             TestCaseInfo const& testCaseInfo = it->getTestCaseInfo();
-            Colour::Code colour = testCaseInfo.isHidden
+            Colour::Code colour = testCaseInfo.isHidden()
                 ? Colour::SecondaryText
                 : Colour::None;
             Colour colourGuard( colour );

include/internal/catch_runner_impl.hpp

@@ -262,6 +262,12 @@ namespace Catch {
             Counts assertions = m_totals.assertions - prevAssertions;
             bool missingAssertions = testForMissingAssertions( assertions );
 
+            if( testCaseInfo.okToFail() ) {
+                std::swap( assertions.failedButOk, assertions.failed );
+                m_totals.assertions.failed -= assertions.failedButOk;
+                m_totals.assertions.failedButOk += assertions.failedButOk;
+            }
+
             SectionStats testCaseSectionStats( testCaseSection, assertions, duration, missingAssertions );
             m_reporter->sectionEnded( testCaseSectionStats );
         }

include/internal/catch_test_case_info.h

@@ -24,15 +24,27 @@ namespace Catch {
     struct ITestCase;
 
     struct TestCaseInfo {
+        enum SpecialProperties{
+            None = 0,
+            IsHidden = 1 << 1,
+            ShouldFail = 1 << 2,
+            MayFail = 1 << 3,
+            Throws = 1 << 4
+        };
+        
         TestCaseInfo(   std::string const& _name,
                         std::string const& _className,
                         std::string const& _description,
                         std::set<std::string> const& _tags,
-                        bool _isHidden,
                         SourceLineInfo const& _lineInfo );
 
         TestCaseInfo( TestCaseInfo const& other );
 
+        bool isHidden() const;
+        bool throws() const;
+        bool okToFail() const;
+        bool expectedToFail() const;
+
         std::string name;
         std::string className;
         std::string description;
@@ -40,8 +52,7 @@ namespace Catch {
         std::set<std::string> lcaseTags;
         std::string tagsAsString;
         SourceLineInfo lineInfo;
-        bool isHidden;
+        SpecialProperties properties;
-        bool throws;
     };
 
     class TestCase : public TestCaseInfo {
@@ -56,9 +67,6 @@ namespace Catch {
 
         TestCaseInfo const& getTestCaseInfo() const;
 
-        bool isHidden() const;
-        bool throws() const;
-
         void swap( TestCase& other );
         bool operator == ( TestCase const& other ) const;
         bool operator < ( TestCase const& other ) const;

include/internal/catch_test_case_info.hpp

@@ -15,14 +15,22 @@
 
 namespace Catch {
 
-    inline bool isSpecialTag( std::string const& tag ) {
+    inline TestCaseInfo::SpecialProperties parseSpecialTag( std::string const& tag ) {
-        return  tag == "." ||
+        if( tag == "." ||
-                tag == "hide" ||
+            tag == "hide" ||
-                tag == "!hide" ||
+            tag == "!hide" )
-                tag == "!throws";
+            return TestCaseInfo::IsHidden;
+        else if( tag == "!throws" )
+            return TestCaseInfo::Throws;
+        else if( tag == "!shouldfail" )
+            return TestCaseInfo::ShouldFail;
+        else if( tag == "!mayfail" )
+            return TestCaseInfo::MayFail;
+        else
+            return TestCaseInfo::None;
     }
     inline bool isReservedTag( std::string const& tag ) {
-        return !isSpecialTag( tag ) && tag.size() > 0 && !isalnum( tag[0] );
+        return parseSpecialTag( tag ) == TestCaseInfo::None && tag.size() > 0 && !isalnum( tag[0] );
     }
     inline void enforceNotReservedTag( std::string const& tag, SourceLineInfo const& _lineInfo ) {
         if( isReservedTag( tag ) ) {
@@ -80,7 +88,7 @@ namespace Catch {
             tags.insert( "." );
         }
 
-        TestCaseInfo info( _name, _className, desc, tags, isHidden, _lineInfo );
+        TestCaseInfo info( _name, _className, desc, tags, _lineInfo );
         return TestCase( _testCase, info );
     }
 
@@ -88,22 +96,20 @@ namespace Catch {
                                 std::string const& _className,
                                 std::string const& _description,
                                 std::set<std::string> const& _tags,
-                                bool _isHidden,
                                 SourceLineInfo const& _lineInfo )
     :   name( _name ),
         className( _className ),
         description( _description ),
         tags( _tags ),
         lineInfo( _lineInfo ),
-        isHidden( _isHidden ),
+        properties( None )
-        throws( false )
     {
         std::ostringstream oss;
         for( std::set<std::string>::const_iterator it = _tags.begin(), itEnd = _tags.end(); it != itEnd; ++it ) {
             oss << "[" << *it << "]";
-            if( *it == "!throws" )
+            std::string lcaseTag = toLower( *it );
-                throws = true;
+            properties = (SpecialProperties)( properties | parseSpecialTag( lcaseTag ) );
-            lcaseTags.insert( toLower( *it ) );
+            lcaseTags.insert( lcaseTag );
         }
         tagsAsString = oss.str();
     }
@@ -116,10 +122,23 @@ namespace Catch {
         lcaseTags( other.lcaseTags ),
         tagsAsString( other.tagsAsString ),
         lineInfo( other.lineInfo ),
-        isHidden( other.isHidden ),
+        properties( other.properties )
-        throws( other.throws )
     {}
 
+    bool TestCaseInfo::isHidden() const {
+        return ( properties & IsHidden ) != 0;
+    }
+    bool TestCaseInfo::throws() const {
+        return ( properties & Throws ) != 0;
+    }
+    bool TestCaseInfo::okToFail() const {
+        return ( properties & (ShouldFail | MayFail ) ) != 0;
+    }
+    bool TestCaseInfo::expectedToFail() const {
+        return ( properties & (ShouldFail ) ) != 0;
+    }
+
+
     TestCase::TestCase( ITestCase* testCase, TestCaseInfo const& info ) : TestCaseInfo( info ), test( testCase ) {}
 
     TestCase::TestCase( TestCase const& other )
@@ -141,8 +160,7 @@ namespace Catch {
         tags.swap( other.tags );
         lcaseTags.swap( other.lcaseTags );
         tagsAsString.swap( other.tagsAsString );
-        std::swap( TestCaseInfo::isHidden, static_cast<TestCaseInfo&>( other ).isHidden );
+        std::swap( TestCaseInfo::properties, static_cast<TestCaseInfo&>( other ).properties );
-        std::swap( TestCaseInfo::throws, static_cast<TestCaseInfo&>( other ).throws );
         std::swap( lineInfo, other.lineInfo );
     }
 
@@ -150,13 +168,6 @@ namespace Catch {
         test->invoke();
     }
 
-    bool TestCase::isHidden() const {
-        return TestCaseInfo::isHidden;
-    }
-    bool TestCase::throws() const {
-        return TestCaseInfo::throws;
-    }
-
     bool TestCase::operator == ( TestCase const& other ) const {
         return  test.get() == other.test.get() &&
                 name == other.name &&

include/internal/catch_test_spec_parser.hpp

@@ -26,16 +26,16 @@ namespace Catch {
         std::string m_arg;
         TestSpec::Filter m_currentFilter;
         TestSpec m_testSpec;
-        ITagAliasRegistry const& m_tagAliases;
+        ITagAliasRegistry const* m_tagAliases;
 
     public:
-        TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( tagAliases ) {}
+        TestSpecParser( ITagAliasRegistry const& tagAliases ) : m_tagAliases( &tagAliases ) {}
 
         TestSpecParser& parse( std::string const& arg ) {
             m_mode = None;
             m_exclusion = false;
             m_start = std::string::npos;
-            m_arg = m_tagAliases.expandAliases( arg );
+            m_arg = m_tagAliases->expandAliases( arg );
             for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
                 visitChar( m_arg[m_pos] );
             if( m_mode == Name )

include/internal/catch_totals.hpp

@@ -9,30 +9,34 @@
 #define TWOBLUECUBES_CATCH_TOTALS_HPP_INCLUDED
 
 #include <cstddef>
+#include <assert.h> // !TBD
 
 namespace Catch {
 
     struct Counts {
-        Counts() : passed( 0 ), failed( 0 ) {}
+        Counts() : passed( 0 ), failed( 0 ), failedButOk( 0 ) {}
 
         Counts operator - ( Counts const& other ) const {
             Counts diff;
             diff.passed = passed - other.passed;
             diff.failed = failed - other.failed;
+            diff.failedButOk = failedButOk - other.failedButOk;
             return diff;
         }
         Counts& operator += ( Counts const& other ) {
             passed += other.passed;
             failed += other.failed;
+            failedButOk += other.failedButOk;
             return *this;
         }
 
         std::size_t total() const {
-            return passed + failed;
+            return passed + failed + failedButOk;
         }
 
         std::size_t passed;
         std::size_t failed;
+        std::size_t failedButOk;
     };
 
     struct Totals {
@@ -48,6 +52,8 @@ namespace Catch {
             Totals diff = *this - prevTotals;
             if( diff.assertions.failed > 0 )
                 ++diff.testCases.failed;
+            else if( diff.assertions.failedButOk > 0 )
+                ++diff.testCases.failedButOk;
             else
                 ++diff.testCases.passed;
             return diff;

include/reporters/catch_reporter_console.hpp

@@ -101,10 +101,12 @@ namespace Catch {
             StreamingReporterBase::testGroupEnded( _testGroupStats );
         }
         virtual void testRunEnded( TestRunStats const& _testRunStats ) {
-            if( m_atLeastOneTestCasePrinted )
+            printTotalsDivider( _testRunStats.totals );
-                printTotalsDivider();
             printTotals( _testRunStats.totals );
-            stream << "\n" << std::endl;
+            if( m_atLeastOneTestCasePrinted ||
+                ( _testRunStats.totals.assertions.total() == 0 && _testRunStats.totals.testCases.total() > 0 ) )
+                printTotalsDivider( _testRunStats.totals );
+            stream << std::endl;
             StreamingReporterBase::testRunEnded( _testRunStats );
         }
 
@@ -326,60 +328,78 @@ namespace Catch {
                                         .setInitialIndent( indent ) ) << "\n";
         }
 
-        void printTotals( const Totals& totals ) {
+        void printTotals( Totals const& totals ) {
+            int cols = 1+(int)log10( (float)std::max( totals.testCases.total(), totals.assertions.total() ) );
             if( totals.testCases.total() == 0 ) {
-                stream << "No tests ran";
+                stream << Colour( Colour::Warning ) << "No tests ran\n";
             }
             else if( totals.assertions.total() == 0 ) {
-                Colour colour( Colour::Yellow );
+                printCounts( "test case", totals.testCases, cols );
-                printCounts( "test case", totals.testCases );
+                stream << "assertions: ";
-                stream << " (no assertions)";
+                stream << Colour( Colour::Warning ) << "- none -\n";
             }
-            else if( totals.assertions.failed ) {
+            else if( totals.assertions.failed + totals.assertions.failedButOk ) {
-                Colour colour( Colour::ResultError );
+                printCounts( "test case", totals.testCases, cols );
-                printCounts( "test case", totals.testCases );
+                printCounts( "assertion", totals.assertions, cols );
-                if( totals.testCases.failed > 0 ) {
-                    stream << " (";
-                    printCounts( "assertion", totals.assertions );
-                    stream << ")";
-                }
             }
             else {
-                Colour colour( Colour::ResultSuccess );
+                stream << Colour( Colour::ResultSuccess ) << "All tests passed";
-                stream << "All tests passed ("
+                stream << " ("
                         << pluralise( totals.assertions.passed, "assertion" ) << " in "
-                        << pluralise( totals.testCases.passed, "test case" ) << ")";
+                        << pluralise( totals.testCases.passed, "test case" ) << ")"
+                        << "\n";
             }
         }
-        void printCounts( std::string const& label, Counts const& counts ) {
+        void printCounts( std::string const& label, Counts const& counts, int cols ) {
-            if( counts.total() == 1 ) {
+            stream << label << "s: ";
-                stream << "1 " << label << " - ";
+
-                if( counts.failed )
+            stream  << Colour( counts.passed > 0 ? Colour::ResultSuccess : Colour::LightGrey )
-                    stream << "failed";
+                    << std::setw( cols ) << counts.passed << " passed";
-                else
+
-                    stream << "passed";
+            stream << Colour( Colour::LightGrey ) << " | ";
-            }
+
-            else {
+            stream  << Colour( counts.failed > 0 ? Colour::ResultError : Colour::LightGrey )
-                stream << counts.total() << " " << label << "s ";
+                    << std::setw( cols ) << counts.failed << " failed";
-                if( counts.passed ) {
+            if( counts.failedButOk > 0 ) {
-                    if( counts.failed )
+                stream  << Colour( Colour::LightGrey ) << " | ";
-                        stream << "- " << counts.failed << " failed";
+                stream  << Colour( counts.failedButOk > 0 ? Colour::ResultExpectedFailure : Colour::LightGrey )
-                    else if( counts.passed == 2 )
+                        << std::setw( cols ) << counts.failedButOk << " failed as expected";
-                        stream << "- both passed";
-                    else
-                        stream << "- all passed";
-                }
-                else {
-                    if( counts.failed == 2 )
-                        stream << "- both failed";
-                    else
-                        stream << "- all failed";
-                }
             }
+            stream << Colour( Colour::LightGrey ) << " | ";
+            stream << "total: " << counts.total() << "\n";
         }
 
-        void printTotalsDivider() {
+        static std::size_t makeRatio( std::size_t number, std::size_t total ) {
-            stream << getLineOfChars<'='>() << "\n";
+            std::size_t ratio = total > 0 ? CATCH_CONFIG_CONSOLE_WIDTH * number/ total : 0;
+            return ( ratio == 0 && number > 0 ) ? 1 : ratio;
+        }
+        static std::size_t& findMax( std::size_t& i, std::size_t& j, std::size_t& k ) {
+            if( i > j && i > k )
+                return i;
+            else if( j > k )
+                return j;
+            else
+                return k;
+        }
+
+        void printTotalsDivider( Totals const& totals ) {
+            if( totals.testCases.total() > 0 ) {
+                std::size_t failedRatio = makeRatio( totals.testCases.failed, totals.testCases.total() );
+                std::size_t failedButOkRatio = makeRatio( totals.testCases.failedButOk, totals.testCases.total() );
+                std::size_t passedRatio = makeRatio( totals.testCases.passed, totals.testCases.total() );
+                while( failedRatio + failedButOkRatio + passedRatio < CATCH_CONFIG_CONSOLE_WIDTH-1 )
+                    findMax( failedRatio, failedButOkRatio, passedRatio )++;
+                while( failedRatio + failedButOkRatio + passedRatio > CATCH_CONFIG_CONSOLE_WIDTH-1 )
+                    findMax( failedRatio, failedButOkRatio, passedRatio )--;
+
+                stream << Colour( Colour::ResultSuccess ) << std::string( passedRatio, '=' );
+                stream << Colour( Colour::Error ) << std::string( failedRatio, '=' );
+                stream << Colour( Colour::ResultExpectedFailure ) << std::string( failedButOkRatio, '=' );
+            }
+            else {
+                stream << Colour( Colour::Warning ) << std::string( CATCH_CONFIG_CONSOLE_WIDTH-1, '=' );
+            }
+            stream << "\n";
         }
         void printSummaryDivider() {
             stream << getLineOfChars<'-'>() << "\n";

include/reporters/catch_reporter_xml.hpp

@@ -40,7 +40,8 @@ namespace Catch {
         virtual void EndTesting( const Totals& totals ) {
             m_xml.scopedElement( "OverallResults" )
                 .writeAttribute( "successes", totals.assertions.passed )
-                .writeAttribute( "failures", totals.assertions.failed );
+                .writeAttribute( "failures", totals.assertions.failed )
+                .writeAttribute( "expectedFailures", totals.assertions.failedButOk );
             m_xml.endElement();
         }
 
@@ -52,7 +53,8 @@ namespace Catch {
         virtual void EndGroup( const std::string&, const Totals& totals ) {
             m_xml.scopedElement( "OverallResults" )
                 .writeAttribute( "successes", totals.assertions.passed )
-                .writeAttribute( "failures", totals.assertions.failed );
+                .writeAttribute( "failures", totals.assertions.failed )
+                .writeAttribute( "expectedFailures", totals.assertions.failedButOk );
             m_xml.endElement();
         }
 
@@ -70,7 +72,8 @@ namespace Catch {
             if( --m_sectionDepth > 0 ) {
                 m_xml.scopedElement( "OverallResults" )
                     .writeAttribute( "successes", assertions.passed )
-                    .writeAttribute( "failures", assertions.failed );
+                    .writeAttribute( "failures", assertions.failed )
+                    .writeAttribute( "expectedFailures", assertions.failedButOk );
                 m_xml.endElement();
             }
         }

projects/SelfTest/Baselines/console.std.approved.txt

@@ -786,5 +786,7 @@ with expansion:
   "first" == "second"
 
 ===============================================================================
-125 test cases - 39 failed (703 assertions - 92 failed)
+test cases:  86 passed |  38 failed |   1 failed as expected | total: 125
+assertions: 611 passed |  79 failed |  13 failed as expected | total: 703
+===============================================================================
 

projects/SelfTest/Baselines/console.sw.approved.txt

@@ -7297,5 +7297,7 @@ with expansion:
   true
 
 ===============================================================================
-125 test cases - 55 failed (723 assertions - 112 failed)
+test cases:  70 passed |  54 failed |   1 failed as expected | total: 125
+assertions: 611 passed |  99 failed |  13 failed as expected | total: 723
+===============================================================================
 

projects/SelfTest/Baselines/console.swa4.approved.txt

@@ -317,6 +317,96 @@ ConditionTests.cpp:<line number>: FAILED:
 with expansion:
   7 == 8
 
-===============================================================================
+-------------------------------------------------------------------------------
-13 test cases - 3 failed (40 assertions - 4 failed)
+Inequality checks that should succeed
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven != 6 )
+with expansion:
+  7 != 6
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.int_seven != 8 )
+with expansion:
+  7 != 8
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 9.11f ) )
+with expansion:
+  9.1 != Approx( 9.1099996567 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 9.0f ) )
+with expansion:
+  9.1 != Approx( 9.0 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 1 ) )
+with expansion:
+  9.1 != Approx( 1.0 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.float_nine_point_one != Approx( 0 ) )
+with expansion:
+  9.1 != Approx( 0.0 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.double_pi != Approx( 3.1415 ) )
+with expansion:
+  3.1415926535 != Approx( 3.1415 )
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello != "goodbye" )
+with expansion:
+  "hello" != "goodbye"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello != "hell" )
+with expansion:
+  "hello" != "hell"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello != "hello1" )
+with expansion:
+  "hello" != "hello1"
+
+ConditionTests.cpp:<line number>:
+PASSED:
+  REQUIRE( data.str_hello.size() != 6 )
+with expansion:
+  5 != 6
+
+-------------------------------------------------------------------------------
+Inequality checks that should fail
+-------------------------------------------------------------------------------
+ConditionTests.cpp:<line number>
+...............................................................................
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.int_seven != 7 )
+with expansion:
+  7 != 7
+
+ConditionTests.cpp:<line number>: FAILED:
+  CHECK( data.float_nine_point_one != Approx( 9.1f ) )
+with expansion:
+  9.1 != Approx( 9.1000003815 )
+
+===============================================================================
+test cases: 11 passed |  3 failed |  1 failed as expected | total: 15
+assertions: 47 passed |  4 failed |  2 failed as expected | total: 53
+===============================================================================
 

projects/SelfTest/Baselines/junit.sw.approved.txt

@@ -1,5 +1,5 @@
 <testsuites>
-  <testsuite errors="12" failures="100" tests="723" hostname="tbd" time="{duration}" timestamp="tbd">
+  <testsuite errors="12" failures="87" tests="723" hostname="tbd" time="{duration}" timestamp="tbd">
     <testcase classname="global" name="Some simple comparisons between doubles" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with different epsilons" time="{duration}"/>
     <testcase classname="global" name="Approximate comparisons with floats" time="{duration}"/>

projects/SelfTest/Baselines/xml.sw.approved.txt

@@ -1408,7 +1408,7 @@
         <Exception filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/ExceptionTests.cpp" >
           unexpected exception
         </Exception>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
@@ -2770,22 +2770,22 @@
         <Failure>
           Message from section one
         </Failure>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="two">
         <Failure>
           Message from section two
         </Failure>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="Standard output from all sections is reported">
       <Section name="one">
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="two">
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -2950,7 +2950,7 @@
             2 != 1
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="s2" description="not equal">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
@@ -2961,7 +2961,7 @@
             1 != 2
           </Expanded>
         </Expression>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -2992,9 +2992,9 @@
               1 != 2
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -3009,27 +3009,27 @@
               1 == 2
             </Expanded>
           </Expression>
-          <OverallResults successes="0" failures="1"/>
+          <OverallResults successes="0" failures="1" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
     <TestCase name="even more nested SECTION tests">
       <Section name="c">
         <Section name="d (leaf)">
-          <OverallResults successes="0" failures="1"/>
+          <OverallResults successes="0" failures="1" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="c">
         <Section name="e (leaf)">
-          <OverallResults successes="0" failures="1"/>
+          <OverallResults successes="0" failures="1" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="f (leaf)">
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -3043,7 +3043,7 @@
             0 > 1
           </Expanded>
         </Expression>
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="false"/>
     </TestCase>
@@ -3232,10 +3232,10 @@
     </TestCase>
     <TestCase name="xmlentitycheck">
       <Section name="embedded xml" description="&lt;test>it should be possible to embed xml characters, such as &lt;, &quot; or &amp;, or even whole &lt;xml>documents&lt;/xml> within an attribute&lt;/test>">
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <Section name="encoded chars" description="these should all be encoded: &amp;&amp;&amp;&quot;&quot;&quot;&lt;&lt;&lt;&amp;&quot;&lt;&lt;&amp;&quot;">
-        <OverallResults successes="0" failures="1"/>
+        <OverallResults successes="0" failures="1" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -3487,7 +3487,7 @@
             10 >= 10
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
         <Original>
@@ -3531,9 +3531,9 @@
               0 == 0
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
         <Original>
@@ -3568,7 +3568,7 @@
             10 >= 10
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/MiscTests.cpp" >
         <Original>
@@ -3603,16 +3603,16 @@
             5 >= 5
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
     <TestCase name="A couple of nested sections followed by a failure">
       <Section name="Outer">
         <Section name="Inner">
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Failure>
         to infinity and beyond
@@ -3682,7 +3682,7 @@
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="test lists">
         <Section name="1 test" description="Specify one test case using">
@@ -3710,9 +3710,9 @@
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using exclude:">
@@ -3740,9 +3740,9 @@
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="test lists">
         <Section name="Specify one test case exclusion using ~">
@@ -3770,9 +3770,9 @@
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="reporter">
         <Section name="-r/console">
@@ -3792,9 +3792,9 @@
               &quot;console&quot; == &quot;console&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="reporter">
         <Section name="-r/xml">
@@ -3814,9 +3814,9 @@
               &quot;xml&quot; == &quot;xml&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="reporter">
         <Section name="--reporter/junit">
@@ -3836,9 +3836,9 @@
               &quot;junit&quot; == &quot;junit&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="debugger">
         <Section name="-b">
@@ -3858,9 +3858,9 @@
               true == true
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="debugger">
         <Section name="--break">
@@ -3880,9 +3880,9 @@
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="abort">
         <Section name="-a aborts after first failure">
@@ -3902,9 +3902,9 @@
               1 == 1
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="abort">
         <Section name="-x 2 aborts after two failures">
@@ -3924,9 +3924,9 @@
               2 == 2
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="abort">
         <Section name="-x must be greater than zero">
@@ -3939,9 +3939,9 @@
 - while parsing: (-x, --abortx &lt;no. failures>)&quot; contains: &quot;greater than zero&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="abort">
         <Section name="-x must be numeric">
@@ -3954,9 +3954,9 @@
 - while parsing: (-x, --abortx &lt;no. failures>)&quot; contains: &quot;-x&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="nothrow">
         <Section name="-e">
@@ -3976,9 +3976,9 @@
               true == true
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="nothrow">
         <Section name="--nothrow">
@@ -3998,9 +3998,9 @@
               true == true
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="output filename">
         <Section name="-o filename">
@@ -4020,9 +4020,9 @@
               &quot;filename.ext&quot; == &quot;filename.ext&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="output filename">
         <Section name="--out">
@@ -4042,9 +4042,9 @@
               &quot;filename.ext&quot; == &quot;filename.ext&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="combinations">
         <Section name="Single character flags can be combined">
@@ -4080,9 +4080,9 @@
               true == true
             </Expanded>
           </Expression>
-          <OverallResults successes="4" failures="0"/>
+          <OverallResults successes="4" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -4109,9 +4109,9 @@
 &quot;one two three four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Wrapped once">
@@ -4175,9 +4175,9 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="5" failures="0"/>
+          <OverallResults successes="5" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Wrapped twice">
@@ -4223,9 +4223,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Wrapped three times">
@@ -4261,9 +4261,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Short wrap">
@@ -4343,9 +4343,9 @@ fo-
 ur&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="5" failures="0"/>
+          <OverallResults successes="5" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="As container">
@@ -4389,9 +4389,9 @@ ur&quot;
               &quot;four&quot; == &quot;four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="5" failures="0"/>
+          <OverallResults successes="5" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="plain string">
         <Section name="Indent first line differently">
@@ -4409,9 +4409,9 @@ ur&quot;
     four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With newlines">
         <Section name="No wrapping">
@@ -4451,9 +4451,9 @@ three four&quot;
 three four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With newlines">
         <Section name="Trailing newline">
@@ -4489,9 +4489,9 @@ three four&quot;
 &quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped once">
@@ -4537,9 +4537,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="3" failures="0"/>
+          <OverallResults successes="3" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With newlines">
         <Section name="Wrapped twice">
@@ -4559,9 +4559,9 @@ three
 four&quot;
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="With tabs">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TestMain.cpp" >
@@ -4580,7 +4580,7 @@ four&quot;
         six&quot;
           </Expanded>
         </Expression>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -5755,7 +5755,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="compare to false">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
@@ -5774,7 +5774,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="negation">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
@@ -5785,7 +5785,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="double negation">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
@@ -5796,7 +5796,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="direct">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
@@ -5815,7 +5815,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -5873,9 +5873,9 @@ there&quot;
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TrickyTests.cpp" >
         <Original>
@@ -5903,9 +5903,9 @@ there&quot;
               true
             </Expanded>
           </Expression>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -6012,7 +6012,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from empty string should have no filters">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6039,7 +6039,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from just a comma should have no filters">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6066,7 +6066,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6093,7 +6093,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from quoted name should have one filter">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6120,7 +6120,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Test spec from name should have one filter">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6155,7 +6155,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the start">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6206,7 +6206,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="6" failures="0"/>
+        <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at the end">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6257,7 +6257,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="6" failures="0"/>
+        <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6308,7 +6308,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="6" failures="0"/>
+        <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the start">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6335,7 +6335,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at the end">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6362,7 +6362,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Redundant wildcard at both ends">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6389,7 +6389,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcard at both ends, redundant at start">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6432,7 +6432,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Just wildcard">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6475,7 +6475,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6510,7 +6510,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag, two matches">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6545,7 +6545,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6580,7 +6580,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Two tags, spare separated">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6615,7 +6615,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Wildcarded name and tag">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6658,7 +6658,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Single tag exclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6693,7 +6693,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one tag inclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6728,7 +6728,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion and one wldcarded name inclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6771,7 +6771,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6814,7 +6814,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="name exclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6857,7 +6857,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6900,7 +6900,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion with tag inclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6943,7 +6943,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="wildcarded name exclusion, using exclude:, with tag inclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -6986,7 +6986,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="two wildcarded names">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -7029,7 +7029,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty tag">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -7072,7 +7072,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="empty quoted name">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -7115,7 +7115,7 @@ there&quot;
             false == false
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="quoted string followed by tag exclusion">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/CmdLineTests.cpp" >
@@ -7158,7 +7158,7 @@ there&quot;
             true == true
           </Expanded>
         </Expression>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7204,7 +7204,7 @@ there&quot;
 	Redefined at file:10&quot; contains: &quot;10&quot;
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Tag aliases must be of the form [@name]">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/TagAliasTests.cpp" >
@@ -7239,7 +7239,7 @@ there&quot;
             registry.add( &quot;[@no square bracket at end&quot;, &quot;&quot;, Catch::SourceLineInfo( &quot;file&quot;, 3 ) )
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7251,7 +7251,7 @@ there&quot;
     </TestCase>
     <TestCase name="Variadic macros">
       <Section name="Section with one argument">
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7276,13 +7276,13 @@ there&quot;
                   true
                 </Expanded>
               </Expression>
-              <OverallResults successes="1" failures="0"/>
+              <OverallResults successes="1" failures="0" expectedFailures="0"/>
             </Section>
-            <OverallResults successes="2" failures="0"/>
+            <OverallResults successes="2" failures="0" expectedFailures="0"/>
           </Section>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7332,15 +7332,15 @@ there&quot;
                     10 >= 10
                   </Expanded>
                 </Expression>
-                <OverallResults successes="2" failures="0"/>
+                <OverallResults successes="2" failures="0" expectedFailures="0"/>
               </Section>
-              <OverallResults successes="2" failures="0"/>
+              <OverallResults successes="2" failures="0" expectedFailures="0"/>
             </Section>
-            <OverallResults successes="4" failures="0"/>
+            <OverallResults successes="4" failures="0" expectedFailures="0"/>
           </Section>
-          <OverallResults successes="4" failures="0"/>
+          <OverallResults successes="4" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="5" failures="0"/>
+        <OverallResults successes="5" failures="0" expectedFailures="0"/>
       </Section>
       <Section name="Given: an empty vector">
         <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/BDDTests.cpp" >
@@ -7369,11 +7369,11 @@ there&quot;
                 0 == 0
               </Expanded>
             </Expression>
-            <OverallResults successes="2" failures="0"/>
+            <OverallResults successes="2" failures="0" expectedFailures="0"/>
           </Section>
-          <OverallResults successes="2" failures="0"/>
+          <OverallResults successes="2" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="3" failures="0"/>
+        <OverallResults successes="3" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7381,11 +7381,11 @@ there&quot;
       <Section name="Given: A section name that is so long that it cannot fit in a single console width">
         <Section name="When: The test headers are printed as part of the normal running of the scenario">
           <Section name="Then: The, deliberately very long and overly verbose (you see what I did there?) section names must wrap, along with an indent">
-            <OverallResults successes="1" failures="0"/>
+            <OverallResults successes="1" failures="0" expectedFailures="0"/>
           </Section>
-          <OverallResults successes="1" failures="0"/>
+          <OverallResults successes="1" failures="0" expectedFailures="0"/>
         </Section>
-        <OverallResults successes="1" failures="0"/>
+        <OverallResults successes="1" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
@@ -7415,7 +7415,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="2" failures="0"/>
+        <OverallResults successes="2" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
@@ -7458,7 +7458,7 @@ there&quot;
             !false
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
@@ -7517,7 +7517,7 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="6" failures="0"/>
+        <OverallResults successes="6" failures="0" expectedFailures="0"/>
       </Section>
       <Expression success="true" filename="/Users/philnash/Dev/OSS/Catch/projects/SelfTest/SectionTrackerTests.cpp" >
         <Original>
@@ -7560,11 +7560,11 @@ there&quot;
             true
           </Expanded>
         </Expression>
-        <OverallResults successes="4" failures="0"/>
+        <OverallResults successes="4" failures="0" expectedFailures="0"/>
       </Section>
       <OverallResult success="true"/>
     </TestCase>
-    <OverallResults successes="611" failures="112"/>
+    <OverallResults successes="611" failures="99" expectedFailures="13"/>
   </Group>
-  <OverallResults successes="611" failures="112"/>
+  <OverallResults successes="611" failures="99" expectedFailures="13"/>
 </Catch>

projects/SelfTest/ConditionTests.cpp

@@ -62,7 +62,7 @@ TEST_CASE( "Equality checks that should succeed", "" )
     REQUIRE( x == Approx( 1.3 ) );
 }
 
-TEST_CASE( "Equality checks that should fail", "[.][failing]" )
+TEST_CASE( "Equality checks that should fail", "[.][failing][!mayfail]" )
 {
     TestData data;