diff options
| author | Johan Björk <phb@spotify.com> | 2011-07-26 07:26:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-07-28 14:42:03 (GMT) |
| commit | 856a9e499f299a33cb4f763bf36a75524a03e4f5 (patch) | |
| tree | 794e18a7cef0ec581600e271ffd0a7a842d4a6a2 /Source/CTest | |
| parent | 4096066723ec7dd6f450e1c8da13616c0ca2f124 (diff) | |
| download | CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.zip CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.tar.gz CMake-856a9e499f299a33cb4f763bf36a75524a03e4f5.tar.bz2 | |
RunSingleCommand: Replace verbose boolean with enum
No behaviour change, this prepares for adding a flag to skip the merging
of output streams.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestGenericHandler.cxx | 2 | ||||
| -rw-r--r-- | Source/CTest/cmCTestGenericHandler.h | 7 | ||||
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestGenericHandler.cxx b/Source/CTest/cmCTestGenericHandler.cxx index 8c3c22a..fd75e45 100644 --- a/Source/CTest/cmCTestGenericHandler.cxx +++ b/Source/CTest/cmCTestGenericHandler.cxx @@ -18,7 +18,7 @@ //---------------------------------------------------------------------- cmCTestGenericHandler::cmCTestGenericHandler() { - this->HandlerVerbose = false; + this->HandlerVerbose = cmSystemTools::OUTPUT_NONE; this->CTest = 0; this->SubmitIndex = 0; this->AppendXML = false; diff --git a/Source/CTest/cmCTestGenericHandler.h b/Source/CTest/cmCTestGenericHandler.h index 7393145..18189ec 100644 --- a/Source/CTest/cmCTestGenericHandler.h +++ b/Source/CTest/cmCTestGenericHandler.h @@ -16,6 +16,7 @@ #include "cmObject.h" #include "cmCTest.h" +#include "cmSystemTools.h" //OutputOption class cmMakefile; class cmCTestCommand; @@ -31,7 +32,9 @@ public: /** * If verbose then more informaiton is printed out */ - void SetVerbose(bool val) { this->HandlerVerbose = val; } + void SetVerbose(bool val) + { this->HandlerVerbose = val ? + cmSystemTools::OUTPUT_MERGE : cmSystemTools::OUTPUT_NONE; } /** * Populate internals from CTest custom scripts @@ -91,7 +94,7 @@ protected: bool StartLogFile(const char* name, cmGeneratedFileStream& xofs); bool AppendXML; - bool HandlerVerbose; + cmSystemTools::OutputOption HandlerVerbose; cmCTest *CTest; t_StringToString Options; t_StringToString PersistentOptions; diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index e3b81df..b824e47 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1301,7 +1301,8 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<cmStdString>& vec) int retVal = 0; cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it << std::endl); - if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0, true + if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0, + cmSystemTools::OUTPUT_MERGE /*this->Verbose*/) || retVal != 0 ) { cmCTestLog(this->CTest, ERROR_MESSAGE, "Problem running command: " |