diff options
| author | Martin Hořeňovský | 2022-03-27 23:35:41 +0200 |
|---|---|---|
| committer | Martin Hořeňovský | 2022-03-28 13:10:13 +0200 |
| commit | 1a8a793178d50b74b0f9a0adb3eec937b61039a9 (patch) | |
| tree | 2a8cadf3fa4478f1a11548485a4a0389d4920d2d /src/catch2/internal/catch_commandline.cpp | |
| parent | a4e4e82474f894d56cbe86e13a2d23bb1b46744d (diff) | |
| download | catch3-1a8a793178d50b74b0f9a0adb3eec937b61039a9.tar.gz | |
Refactor colour handling to prepare for per-reporter colour modes
This includes always compiling the ANSI and None colour
implementations, as they don't need to touch any platform
specific APIs, and removing their respective compile-time
configuration options.
Because the Win32 colour implementation requires Win32-specific
APIs, it is still hidden behind a compile-time toggle,
`CATCH_CONFIG_COLOUR_WIN32` (renamed from `..._COLOUR_WINDOWS`).
The commandline options for colours were also changed. The
option now uses different name, and allows to select between
different implementations, rather than changing whether
the compiled-in colour implementation is used through
"yes/no/default" options.
Diffstat (limited to 'src/catch2/internal/catch_commandline.cpp')
| -rw-r--r-- | src/catch2/internal/catch_commandline.cpp | 54 |
1 files changed, 40 insertions, 14 deletions
diff --git a/src/catch2/internal/catch_commandline.cpp b/src/catch2/internal/catch_commandline.cpp index 540adc55..6363e47a 100644 --- a/src/catch2/internal/catch_commandline.cpp +++ b/src/catch2/internal/catch_commandline.cpp @@ -13,6 +13,7 @@ #include <catch2/interfaces/catch_interfaces_registry_hub.hpp> #include <catch2/interfaces/catch_interfaces_reporter_registry.hpp> #include <catch2/interfaces/catch_interfaces_reporter.hpp> +#include <catch2/internal/catch_console_colour.hpp> #include <algorithm> #include <fstream> @@ -95,19 +96,44 @@ namespace Catch { return ParserResult::runtimeError("Could not parse '" + seed + "' as seed"); } }; - auto const setColourUsage = [&]( std::string const& useColour ) { - auto mode = toLower( useColour ); + auto const setColourMode = [&]( std::string const& + colourMode ) { + auto mode = toLower( colourMode ); - if( mode == "yes" ) - config.useColour = UseColour::Yes; - else if( mode == "no" ) - config.useColour = UseColour::No; - else if( mode == "auto" ) - config.useColour = UseColour::Auto; - else - return ParserResult::runtimeError( "colour mode must be one of: auto, yes or no. '" + useColour + "' not recognised" ); - return ParserResult::ok( ParseResultType::Matched ); - }; + if ( mode == "default" ) { + if ( !isColourImplAvailable( ColourMode::PlatformDefault ) ) { + return ParserResult::runtimeError( + "colour mode 'default' is not supported in this " + "binary" ); + } + config.colourMode = ColourMode::PlatformDefault; + } else if ( mode == "ansi" ) { + if ( !isColourImplAvailable( ColourMode::ANSI ) ) { + return ParserResult::runtimeError( + "colour mode 'ansi' is not supported in this binary" ); + } + config.colourMode = ColourMode::ANSI; + } else if ( mode == "win32" ) { + if ( !isColourImplAvailable( ColourMode::Win32 ) ) { + return ParserResult::runtimeError( + "colour mode 'win32' is not supported in this " + "binary" ); + } + config.colourMode = ColourMode::Win32; + } else if ( mode == "none" ) { + if ( !isColourImplAvailable( ColourMode::None ) ) { + return ParserResult::runtimeError( + "colour mode 'none' is not supported in this binary" ); + } + config.colourMode = ColourMode::None; + } else { + return ParserResult::runtimeError( + "colour mode must be one of: default, ansi, win32, " + "or none. '" + + colourMode + "' not recognised" ); + } + return ParserResult::ok( ParseResultType::Matched ); + }; auto const setWaitForKeypress = [&]( std::string const& keypress ) { auto keypressLc = toLower( keypress ); if (keypressLc == "never") @@ -298,8 +324,8 @@ namespace Catch { | Opt( setRngSeed, "'time'|'random-device'|number" ) ["--rng-seed"] ( "set a specific seed for random numbers" ) - | Opt( setColourUsage, "yes|no|auto" ) - ["--use-colour"] + | Opt( setColourMode, "ansi|win32|none|default" ) + ["--colour-mode"] ( "should output be colourised" ) | Opt( config.libIdentify ) ["--libidentify"] |