kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Allow CTEST_UPDATE_COMMAND and fix the comments. This should allow SVN update too, maybe

Browse Source
This commit is contained in:
Andy Cedilnik 2006-04-29 20:13:05 -04:00
parent 9102d547ad
commit 34feb381be
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/CTest/cmCTestScriptHandler.cxx
View File

@ -113,7 +113,7 @@ void cmCTestScriptHandler::Initialize()
this->CTestRoot = ""; this->CTestRoot = "";
this->CVSCheckOut = ""; this->CVSCheckOut = "";
this->CTestCmd = ""; this->CTestCmd = "";
this->CVSCmd = ""; this->UpdateCmd = "";
this->CTestEnv = ""; this->CTestEnv = "";
this->InitCache = ""; this->InitCache = "";
this->CMakeCmd = ""; this->CMakeCmd = "";
@ -389,8 +389,13 @@ int cmCTestScriptHandler::ExtractVariables()
= this->Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT"); = this->Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT");
this->CTestRoot this->CTestRoot
= this->Makefile->GetSafeDefinition("CTEST_DASHBOARD_ROOT"); = this->Makefile->GetSafeDefinition("CTEST_DASHBOARD_ROOT");
this->CVSCmd this->UpdateCmd
= this->Makefile->GetSafeDefinition("CTEST_CVS_COMMAND"); = this->Makefile->GetSafeDefinition("CTEST_UPDATE_COMMAND");
if ( this->UpdateCmd.empty() )
{
this->UpdateCmd
= this->Makefile->GetSafeDefinition("CTEST_CVS_COMMAND");
}
this->CTestEnv this->CTestEnv
= this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT"); = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
this->InitCache this->InitCache
@ -420,7 +425,7 @@ int cmCTestScriptHandler::ExtractVariables()
const char *updateVal = this->Makefile->GetDefinition(updateVar); const char *updateVal = this->Makefile->GetDefinition(updateVar);
if ( updateVal ) if ( updateVal )
{ {
if ( this->CVSCmd.empty() ) if ( this->UpdateCmd.empty() )
{ {
cmSystemTools::Error(updateVar, cmSystemTools::Error(updateVar,
" specified without specifying CTEST_CVS_COMMAND."); " specified without specifying CTEST_CVS_COMMAND.");
@ -669,7 +674,7 @@ int cmCTestScriptHandler::PerformExtraUpdates()
bool res; bool res;
// do an initial cvs update as required // do an initial cvs update as required
command = this->CVSCmd; command = this->UpdateCmd;
std::vector<cmStdString>::iterator it; std::vector<cmStdString>::iterator it;
for (it = this->ExtraUpdates.begin(); for (it = this->ExtraUpdates.begin();
it != this->ExtraUpdates.end(); it != this->ExtraUpdates.end();
@ -684,14 +689,14 @@ int cmCTestScriptHandler::PerformExtraUpdates()
fullCommand += cvsArgs[1]; fullCommand += cvsArgs[1];
output = ""; output = "";
retVal = 0; retVal = 0;
cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run CVS: " cmCTestLog(this->CTest, HANDLER_VERBOSE_OUTPUT, "Run Update: "
<< fullCommand.c_str() << std::endl); << fullCommand.c_str() << std::endl);
res = cmSystemTools::RunSingleCommand(fullCommand.c_str(), &output, res = cmSystemTools::RunSingleCommand(fullCommand.c_str(), &output,
&retVal, cvsArgs[0].c_str(), &retVal, cvsArgs[0].c_str(),
this->HandlerVerbose, 0 /*this->TimeOut*/); this->HandlerVerbose, 0 /*this->TimeOut*/);
if (!res || retVal != 0) if (!res || retVal != 0)
{ {
cmSystemTools::Error("Unable to perform extra cvs updates:\n", cmSystemTools::Error("Unable to perform extra updates:\n",
output.c_str()); output.c_str());
return 0; return 0;
} }

3
Source/CTest/cmCTestScriptHandler.h
View File

@ -45,6 +45,7 @@ class cmCTestCommand;
* CTEST_CONTINUOUS_MINIMUM_INTERVAL * CTEST_CONTINUOUS_MINIMUM_INTERVAL
* CTEST_CVS_CHECKOUT * CTEST_CVS_CHECKOUT
* CTEST_CVS_COMMAND * CTEST_CVS_COMMAND
* CTEST_UPDATE_COMMAND
* CTEST_DASHBOARD_ROOT * CTEST_DASHBOARD_ROOT
* CTEST_ENVIRONMENT * CTEST_ENVIRONMENT
* CTEST_INITIAL_CACHE * CTEST_INITIAL_CACHE
@ -138,7 +139,7 @@ private:
cmStdString CTestRoot; cmStdString CTestRoot;
cmStdString CVSCheckOut; cmStdString CVSCheckOut;
cmStdString CTestCmd; cmStdString CTestCmd;
cmStdString CVSCmd; cmStdString UpdateCmd;
cmStdString CTestEnv; cmStdString CTestEnv;
cmStdString InitCache; cmStdString InitCache;
cmStdString CMakeCmd; cmStdString CMakeCmd;