diff options
Diffstat (limited to 'Source/CTest/cmCTestBuildHandler.h')
-rw-r--r-- | Source/CTest/cmCTestBuildHandler.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/Source/CTest/cmCTestBuildHandler.h b/Source/CTest/cmCTestBuildHandler.h index 722c59009..a5193f6e5 100644 --- a/Source/CTest/cmCTestBuildHandler.h +++ b/Source/CTest/cmCTestBuildHandler.h @@ -5,19 +5,22 @@ #include "cmConfigure.h" // IWYU pragma: keep -#include "cmCTestGenericHandler.h" - -#include "cmDuration.h" -#include "cmProcessOutput.h" -#include "cmsys/RegularExpression.hxx" #include <chrono> #include <deque> #include <iosfwd> -#include <stddef.h> #include <string> #include <vector> +#include <stddef.h> + +#include "cmsys/RegularExpression.hxx" + +#include "cmCTestGenericHandler.h" +#include "cmDuration.h" +#include "cmProcessOutput.h" + class cmMakefile; +class cmStringReplaceHelper; class cmXMLWriter; /** \class cmCTestBuildHandler @@ -27,8 +30,8 @@ class cmXMLWriter; class cmCTestBuildHandler : public cmCTestGenericHandler { public: - typedef cmCTestGenericHandler Superclass; - typedef cmProcessOutput::Encoding Encoding; + using Superclass = cmCTestGenericHandler; + using Encoding = cmProcessOutput::Encoding; /* * The main entry point for this class @@ -110,7 +113,7 @@ private: std::vector<cmsys::RegularExpression> WarningMatchRegex; std::vector<cmsys::RegularExpression> WarningExceptionRegex; - typedef std::deque<char> t_BuildProcessingQueueType; + using t_BuildProcessingQueueType = std::deque<char>; void ProcessBuffer(const char* data, size_t length, size_t& tick, size_t tick_len, std::ostream& ofs, @@ -125,7 +128,7 @@ private: std::string SimplifySourceDir; std::string SimplifyBuildDir; size_t OutputLineCounter; - typedef std::vector<cmCTestBuildErrorWarning> t_ErrorsAndWarningsVector; + using t_ErrorsAndWarningsVector = std::vector<cmCTestBuildErrorWarning>; t_ErrorsAndWarningsVector ErrorsAndWarnings; t_ErrorsAndWarningsVector::iterator LastErrorOrWarning; size_t PostContextCount; @@ -143,6 +146,9 @@ private: int MaxErrors; int MaxWarnings; + // Used to remove ANSI color codes before checking for errors and warnings. + cmStringReplaceHelper* ColorRemover; + bool UseCTestLaunch; std::string CTestLaunchDir; class LaunchHelper; |