summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestTestHandler.cxx
diff options
context:
space:
mode:
authorJohan Björk <phb@spotify.com>2011-07-26 07:26:18 (GMT)
committerBrad King <brad.king@kitware.com>2011-07-28 14:42:03 (GMT)
commit856a9e499f299a33cb4f763bf36a75524a03e4f5 (patch)
tree794e18a7cef0ec581600e271ffd0a7a842d4a6a2 /Source/CTest/cmCTestTestHandler.cxx
parent4096066723ec7dd6f450e1c8da13616c0ca2f124 (diff)
downloadCMake-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/cmCTestTestHandler.cxx')
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx3
1 files changed, 2 insertions, 1 deletions
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: "