dev build 4

- undisturbed background colour (windows), from PR #456
Merge branch 'develop' of git://github.com/RandomInEqualities/Catch into RandomInEqualities-develop
2025-11-04 00:51:52 +01:00 · 2015-07-06 06:23:13 +01:00 · 2015-07-06 06:13:56 +01:00 · 2015-07-03 18:30:25 +01:00 · 2015-07-03 18:27:36 +01:00 · 2015-07-03 18:07:13 +01:00
11 changed files with 33 additions and 21 deletions
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ![catch logo](catch-logo-small.png)

-*v1.2.1-develop.2*
+*v1.2.1-develop.4*

 Build status (on Travis CI) [![Build Status](https://travis-ci.org/philsquared/Catch.png)](https://travis-ci.org/philsquared/Catch)

--- a/include/catch_runner.hpp
+++ b/include/catch_runner.hpp
@@ -112,7 +112,7 @@ namespace Catch {
            std::set<std::string> tags = test.tags;
            
            std::string filename = test.lineInfo.file;
-            std::string::size_type lastSlash = filename.find_last_of( "\//" );
+            std::string::size_type lastSlash = filename.find_last_of( "\\/" );
            if( lastSlash != std::string::npos )
                filename = filename.substr( lastSlash+1 );

--- a/include/internal/catch_console_colour_impl.hpp
+++ b/include/internal/catch_console_colour_impl.hpp
@@ -60,12 +60,13 @@ namespace {
        {
            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalAttributes = csbiInfo.wAttributes;
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
        }

        virtual void use( Colour::Code _colourCode ) {
            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalAttributes );
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
@@ -85,10 +86,11 @@ namespace {

    private:
        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute );
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
        }
        HANDLE stdoutHandle;
-        WORD originalAttributes;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
    };

    IColourImpl* platformColourInstance() {
--- a/include/internal/catch_runner_impl.hpp
+++ b/include/internal/catch_runner_impl.hpp
@@ -78,7 +78,7 @@ namespace Catch {
        virtual ~RunContext() {
            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
            m_context.setRunner( m_prevRunner );
-            m_context.setConfig( CATCH_NULL );
+            m_context.setConfig( Ptr<IConfig const>() );
            m_context.setResultCapture( m_prevResultCapture );
            m_context.setConfig( m_prevConfig );
        }
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -37,7 +37,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 2, 1, "develop", 2 );
+    Version libraryVersion( 1, 2, 1, "develop", 4 );

 }

--- a/projects/SelfTest/CmdLineTests.cpp
+++ b/projects/SelfTest/CmdLineTests.cpp
@@ -9,6 +9,9 @@
 #include "catch.hpp"
 #include "catch_test_spec_parser.hpp"

+#ifdef __clang__
+#   pragma clang diagnostic ignored "-Wc++98-compat"
+#endif

 inline Catch::TestCase fakeTestCase( const char* name, const char* desc = "" ){ return Catch::makeTestCase( CATCH_NULL, "", name, desc, CATCH_INTERNAL_LINEINFO ); }

--- a/projects/SelfTest/ConditionTests.cpp
+++ b/projects/SelfTest/ConditionTests.cpp
@@ -6,7 +6,8 @@
 *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 */
 #ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
+#   pragma clang diagnostic ignored "-Wpadded"
+#   pragma clang diagnostic ignored "-Wc++98-compat"
 #endif

 #include "catch.hpp"
--- a/projects/SelfTest/SectionTrackerTests.cpp
+++ b/projects/SelfTest/SectionTrackerTests.cpp
@@ -7,7 +7,8 @@
 */

 #ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
+#   pragma clang diagnostic ignored "-Wpadded"
+#   pragma clang diagnostic ignored "-Wc++98-compat"
 #endif

 #include "internal/catch_test_case_tracker.hpp"
--- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
+++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp
@@ -1,2 +1,4 @@
 // This file is only here to verify (to the extent possible) the self sufficiency of the header
+#include "catch_suppress_warnings.h"
 #include "catch_xmlwriter.hpp"
+#include "catch_reenable_warnings.h"
--- a/projects/SelfTest/TestMain.cpp
+++ b/projects/SelfTest/TestMain.cpp
@@ -16,8 +16,9 @@ CATCH_REGISTER_TAG_ALIAS( "[@tricky]", "[tricky]~[.]" )


 #ifdef __clang__
-#pragma clang diagnostic ignored "-Wpadded"
-#pragma clang diagnostic ignored "-Wweak-vtables"
+#   pragma clang diagnostic ignored "-Wpadded"
+#   pragma clang diagnostic ignored "-Wweak-vtables"
+#   pragma clang diagnostic ignored "-Wc++98-compat"
 #endif


--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v1.2.1-develop.2
- *  Generated: 2015-07-02 23:02:49.715552
+ *  Catch v1.2.1-develop.4
+ *  Generated: 2015-07-06 06:21:18.816844
 *  ----------------------------------------------------------
 *  This file has been merged from multiple headers. Please don't edit it directly
 *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -5213,7 +5213,7 @@ namespace Catch {
        virtual ~RunContext() {
            m_reporter->testRunEnded( TestRunStats( m_runInfo, m_totals, aborting() ) );
            m_context.setRunner( m_prevRunner );
-            m_context.setConfig( CATCH_NULL );
+            m_context.setConfig( Ptr<IConfig const>() );
            m_context.setResultCapture( m_prevResultCapture );
            m_context.setConfig( m_prevConfig );
        }
@@ -5618,7 +5618,7 @@ namespace Catch {
            std::set<std::string> tags = test.tags;

            std::string filename = test.lineInfo.file;
-            std::string::size_type lastSlash = filename.find_last_of( "\//" );
+            std::string::size_type lastSlash = filename.find_last_of( "\\/" );
            if( lastSlash != std::string::npos )
                filename = filename.substr( lastSlash+1 );

@@ -6333,12 +6333,13 @@ namespace {
        {
            CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
            GetConsoleScreenBufferInfo( stdoutHandle, &csbiInfo );
-            originalAttributes = csbiInfo.wAttributes;
+            originalForegroundAttributes = csbiInfo.wAttributes & ~( BACKGROUND_GREEN | BACKGROUND_RED | BACKGROUND_BLUE | BACKGROUND_INTENSITY );
+            originalBackgroundAttributes = csbiInfo.wAttributes & ~( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE | FOREGROUND_INTENSITY );
        }

        virtual void use( Colour::Code _colourCode ) {
            switch( _colourCode ) {
-                case Colour::None:      return setTextAttribute( originalAttributes );
+                case Colour::None:      return setTextAttribute( originalForegroundAttributes );
                case Colour::White:     return setTextAttribute( FOREGROUND_GREEN | FOREGROUND_RED | FOREGROUND_BLUE );
                case Colour::Red:       return setTextAttribute( FOREGROUND_RED );
                case Colour::Green:     return setTextAttribute( FOREGROUND_GREEN );
@@ -6358,10 +6359,11 @@ namespace {

    private:
        void setTextAttribute( WORD _textAttribute ) {
-            SetConsoleTextAttribute( stdoutHandle, _textAttribute );
+            SetConsoleTextAttribute( stdoutHandle, _textAttribute | originalBackgroundAttributes );
        }
        HANDLE stdoutHandle;
-        WORD originalAttributes;
+        WORD originalForegroundAttributes;
+        WORD originalBackgroundAttributes;
    };

    IColourImpl* platformColourInstance() {
@@ -6821,7 +6823,7 @@ namespace Catch {
        return os;
    }

-    Version libraryVersion( 1, 2, 1, "develop", 2 );
+    Version libraryVersion( 1, 2, 1, "develop", 4 );

 }
Author	SHA1	Message	Date
Phil Nash	584032dfa4	dev build 4 - undisturbed background colour (windows), from PR #456	2015-07-06 06:23:13 +01:00
Phil Nash	18acff62d3	Merge branch 'develop' of git://github.com/RandomInEqualities/Catch into RandomInEqualities-develop	2015-07-06 06:13:56 +01:00
Phil Nash	c1ca0fdabe	dev build 3	2015-07-03 18:30:25 +01:00
Phil Nash	d6f1446e4e	Fixed an issue on some compilers with implicit conversion from nullptr to Ptr - also cleaned up some warnings to do with CATCH_NULL	2015-07-03 18:27:36 +01:00
Phil Nash	62e517f833	Fixed backslash detection in filenames-as-tags	2015-07-03 18:07:13 +01:00
csa	6160a2b079	Fix for white background in windows powershell when using colour output. This commit fixes the white background that appears in windows powershell when catch outputs messages with colour. The previous implementation ignored the original background colour and defaulted to a white background.	2015-07-03 12:02:40 +02:00