diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-02 14:23:23 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-02 14:39:30 (GMT) |
| commit | f33d875a844114945f3e698266639a63401f6ac1 (patch) | |
| tree | 8f317949833cd26aa4a0a33847cad581b548f737 /Source/CTest | |
| parent | 477b07213a806c825f95fdfacd444028e1783dc2 (diff) | |
| download | CMake-f33d875a844114945f3e698266639a63401f6ac1.zip CMake-f33d875a844114945f3e698266639a63401f6ac1.tar.gz CMake-f33d875a844114945f3e698266639a63401f6ac1.tar.bz2 | |
CTest: Implement message(STATUS) output for 'ctest -S' scripts
Send status messages to the CTest HANDLER_OUTPUT log since they are part
of the script handler output. This also ensures they appear inline with
other test command handler output.
Diffstat (limited to 'Source/CTest')
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 567acfc..f050148 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -317,6 +317,15 @@ int cmCTestScriptHandler::ExecuteScript(const std::string& total_script_arg) return retVal; } +static void ctestScriptProgressCallback(const char *m, float, void* cd) +{ + cmCTest* ctest = static_cast<cmCTest*>(cd); + if(m && *m) + { + cmCTestLog(ctest, HANDLER_OUTPUT, "-- " << m << std::endl); + } +} + void cmCTestScriptHandler::CreateCMake() { // create a cmake instance to read the configuration script @@ -334,6 +343,8 @@ void cmCTestScriptHandler::CreateCMake() this->LocalGenerator = this->GlobalGenerator->CreateLocalGenerator(); this->Makefile = this->LocalGenerator->GetMakefile(); + this->CMake->SetProgressCallback(ctestScriptProgressCallback, this->CTest); + // Set CMAKE_CURRENT_SOURCE_DIR and CMAKE_CURRENT_BINARY_DIR. // Also, some commands need Makefile->GetCurrentDirectory(). std::string cwd = cmSystemTools::GetCurrentWorkingDirectory(); |