Progmasoft Git

catch3

Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.

Clonegit clone https://git.progmasoft.com/catch3

Reverted ANSI colour change (it was failing for Windows)

Produced build 20
Commit
ead139e094c795479da73a8ac99c891da6bf001a
Author
Phil Nash ·
Parents
5bdae8456cde

Files · Download .tar.gz

Changes

 README                                          | 2 +-
 include/internal/catch_console_colour_impl.hpp  | 2 +-
 include/internal/catch_version.hpp              | 2 +-
 projects/SelfTest/Baselines/approvedResults.txt | 4 ++--
 single_include/catch.hpp                        | 8 ++++----
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README b/README
index 4f9d35de..be0d2fa0 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-CATCH v0.9 build 19 (integration branch)
+CATCH v0.9 build 20 (integration branch)
 ---------------------------------------------
 
 CATCH is an automated test framework for C, C++ and Objective-C.
diff --git a/include/internal/catch_console_colour_impl.hpp b/include/internal/catch_console_colour_impl.hpp
index a274be47..340628d6 100644
--- a/include/internal/catch_console_colour_impl.hpp
+++ b/include/internal/catch_console_colour_impl.hpp
@@ -10,7 +10,7 @@
 
 #include "catch_console_colour.hpp"
 
-#if !defined( CATCH_CONFIG_NO_COLOUR )
+#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES )
 
 #include <unistd.h>
 
diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp
index bc4611da..b272246c 100644
--- a/include/internal/catch_version.hpp
+++ b/include/internal/catch_version.hpp
@@ -13,7 +13,7 @@
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 0, 9, 19, "integration" );
+    Version libraryVersion( 0, 9, 20, "integration" );
 }
 
 #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED
diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt
index 058b47bb..96f71267 100644
--- a/projects/SelfTest/Baselines/approvedResults.txt
+++ b/projects/SelfTest/Baselines/approvedResults.txt
@@ -1,5 +1,5 @@
 
-CatchSelfTest is a CATCH v0.9 b18 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b19 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
@@ -4279,7 +4279,7 @@ BDDTests.cpp:29:
 99 test cases - 47 failed (616 assertions - 104 failed)
 
 
-CatchSelfTest is a CATCH v0.9 b18 (integration) host application.
+CatchSelfTest is a CATCH v0.9 b19 (integration) host application.
 Run with -? for options
 
 -------------------------------------------------------------------------------
diff --git a/single_include/catch.hpp b/single_include/catch.hpp
index 0df3c9b3..f0fa4193 100644
--- a/single_include/catch.hpp
+++ b/single_include/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  CATCH v0.9 build 19 (integration branch)
- *  Generated: 2013-02-19 19:46:31.030694
+ *  CATCH v0.9 build 20 (integration branch)
+ *  Generated: 2013-02-19 19:57:51.967870
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved.
@@ -5352,7 +5352,7 @@ namespace Catch {
 
 } // end namespace Catch
 
-#if !defined( CATCH_CONFIG_NO_COLOUR )
+#if defined( CATCH_CONFIG_USE_ANSI_COLOUR_CODES )
 
 #include <unistd.h>
 
@@ -5838,7 +5838,7 @@ namespace Catch {
 namespace Catch {
 
     // These numbers are maintained by a script
-    Version libraryVersion( 0, 9, 19, "integration" );
+    Version libraryVersion( 0, 9, 20, "integration" );
 }
 
 // #included from: catch_line_wrap.hpp