3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't use console colour if running in XCode

This commit is contained in:
Phil Nash 2017-09-19 15:25:33 +01:00
parent 0a146e3af7
commit 54f1ce2af2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/internal/catch_console_colour.cpp
View File

@ -20,6 +20,7 @@
#include "catch_stream.h" #include "catch_stream.h"
#include "catch_context.h" #include "catch_context.h"
#include "catch_platform.h" #include "catch_platform.h"
#include "catch_debugger.h"
namespace Catch { namespace Catch {
namespace { namespace {
@ -156,6 +157,13 @@ namespace {
} }
}; };
bool useColourOnPlatform() {
return
#ifdef CATCH_PLATFORM_MAC
!isDebuggerActive() &&
#endif
isatty(STDOUT_FILENO);
}
IColourImpl* platformColourInstance() { IColourImpl* platformColourInstance() {
ErrnoGuard guard; ErrnoGuard guard;
IConfigPtr config = getCurrentContext().getConfig(); IConfigPtr config = getCurrentContext().getConfig();
@ -163,7 +171,7 @@ namespace {
? config->useColour() ? config->useColour()
: UseColour::Auto; : UseColour::Auto;
if( colourMode == UseColour::Auto ) if( colourMode == UseColour::Auto )
colourMode = isatty(STDOUT_FILENO) colourMode = useColourOnPlatform()
? UseColour::Yes ? UseColour::Yes
: UseColour::No; : UseColour::No;
return colourMode == UseColour::Yes return colourMode == UseColour::Yes