diff options
| author | Brad King <brad.king@kitware.com> | 2015-04-20 19:36:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-04-20 19:47:50 (GMT) |
| commit | 356c26ebdfa053f59b2932c78ae81cba3c872dc3 (patch) | |
| tree | 48586b8e866870dc225395280ee8c1123998db65 /Source/CTest/cmCTestTestHandler.cxx | |
| parent | f438cd373131b85dd71b1f902c56fb3584cf8f87 (diff) | |
| download | CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.zip CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.tar.gz CMake-356c26ebdfa053f59b2932c78ae81cba3c872dc3.tar.bz2 | |
cmSystemTools: Teach RunSingleCommand to separate stdout and stderr
Extend the RunSingleCommand signature to capture stdout and stderr
separately. Allow both to be captured to the same std::string
to preserve existing behavior. Update all call sites to do this
so that this refactoring does not introduce functional changes.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index d778253..95cdf3b 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1334,7 +1334,7 @@ int cmCTestTestHandler::ExecuteCommands(std::vector<std::string>& vec) int retVal = 0; cmCTestOptionalLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run command: " << *it << std::endl, this->Quiet); - if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, &retVal, 0, + if ( !cmSystemTools::RunSingleCommand(it->c_str(), 0, 0, &retVal, 0, cmSystemTools::OUTPUT_MERGE /*this->Verbose*/) || retVal != 0 ) { |