diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-30 00:13:05 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2006-04-30 00:13:05 (GMT) |
| commit | 34feb381bef45e397c1f8916627a5a6de4846175 (patch) | |
| tree | 48954c8e042d372bdd4a94d0a2bc875de3a02a4d /Source/CTest/cmCTestScriptHandler.cxx | |
| parent | 9102d547ad158b64ef50e1f56c1355915189ee80 (diff) | |
| download | CMake-34feb381bef45e397c1f8916627a5a6de4846175.zip CMake-34feb381bef45e397c1f8916627a5a6de4846175.tar.gz CMake-34feb381bef45e397c1f8916627a5a6de4846175.tar.bz2 | |
ENH: Allow CTEST_UPDATE_COMMAND and fix the comments. This should allow SVN update too, maybe
Diffstat (limited to 'Source/CTest/cmCTestScriptHandler.cxx')
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 9350334..c65491f 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -113,7 +113,7 @@ void cmCTestScriptHandler::Initialize() this->CTestRoot = ""; this->CVSCheckOut = ""; this->CTestCmd = ""; - this->CVSCmd = ""; + this->UpdateCmd = ""; this->CTestEnv = ""; this->InitCache = ""; this->CMakeCmd = ""; @@ -389,8 +389,13 @@ int cmCTestScriptHandler::ExtractVariables() = this->Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT"); this->CTestRoot = this->Makefile->GetSafeDefinition("CTEST_DASHBOARD_ROOT"); - this->CVSCmd - = this->Makefile->GetSafeDefinition("CTEST_CVS_COMMAND"); + this->UpdateCmd + = this->Makefile->GetSafeDefinition("CTEST_UPDATE_COMMAND"); + if ( this->UpdateCmd.empty() ) + { + this->UpdateCmd + = this->Makefile->GetSafeDefinition("CTEST_CVS_COMMAND"); + } this->CTestEnv = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT"); this->InitCache @@ -420,7 +425,7 @@ int cmCTestScriptHandler::ExtractVariables() const char *updateVal = this->Makefile->GetDefinition(updateVar); if ( updateVal ) { - if ( this->CVSCmd.empty() ) + if ( this->UpdateCmd.empty() ) { cmSystemTools::Error(updateVar, " specified without specifying CTEST_CVS_COMMAND."); @@ -669,7 +674,7 @@ int cmCTestScriptHandler::PerformExtraUpdates() bool res; // do an initial cvs update as required - command = this->CVSCmd; + command = this->UpdateCmd; std::vector<cmStdString>::iterator it; for (it = this->ExtraUpdates.begin(); it != this->ExtraUpdates.end(); @@ -684,14 +689,14 @@ int cmCTestScriptHandler::PerformExtraUpdates() fullCommand += cvsArgs[1]; output = ""; retVal = 0; - cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run CVS: " + cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run Update: " << fullCommand.c_str() << std::endl); res = cmSystemTools::RunSingleCommand(fullCommand.c_str(), &output, &retVal, cvsArgs[0].c_str(), this->HandlerVerbose, 0 /*this->TimeOut*/); if (!res || retVal != 0) { - cmSystemTools::Error("Unable to perform extra cvs updates:\n", + cmSystemTools::Error("Unable to perform extra updates:\n", output.c_str()); return 0; } |