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

ENH: clean up running of default script

This commit is contained in:
Ken Martin 2005-01-27 13:31:31 -05:00
parent dc0ce24cc6
commit d268431ac8
3 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/CTest/cmCTestRunScriptCommand.cxx
View File

@ -32,7 +32,6 @@ bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args)
{ {
cmCTestScriptHandler::RunScript(m_CTest, args[i].c_str()); cmCTestScriptHandler::RunScript(m_CTest, args[i].c_str());
} }
return true; return true;
} }

33
Source/CTest/cmCTestScriptHandler.cxx
View File

@ -75,7 +75,6 @@ cmCTestScriptHandler::cmCTestScriptHandler()
{ {
m_Verbose = false; m_Verbose = false;
m_Backup = false; m_Backup = false;
m_ScriptHasRun = false;
m_EmptyBinDir = false; m_EmptyBinDir = false;
m_EmptyBinDirOnce = false; m_EmptyBinDirOnce = false;
m_Makefile = 0; m_Makefile = 0;
@ -191,17 +190,16 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
m_LocalGenerator = m_GlobalGenerator->CreateLocalGenerator(); m_LocalGenerator = m_GlobalGenerator->CreateLocalGenerator();
m_LocalGenerator->SetGlobalGenerator(m_GlobalGenerator); m_LocalGenerator->SetGlobalGenerator(m_GlobalGenerator);
m_Makefile = m_LocalGenerator->GetMakefile();
// set a variable with the path to the current script // set a variable with the path to the current script
m_LocalGenerator->GetMakefile()->AddDefinition("CTEST_SCRIPT_DIRECTORY", m_Makefile->AddDefinition("CTEST_SCRIPT_DIRECTORY",
cmSystemTools::GetFilenamePath( cmSystemTools::GetFilenamePath(script).c_str());
script).c_str()); m_Makefile->AddDefinition("CTEST_SCRIPT_NAME",
m_LocalGenerator->GetMakefile()->AddDefinition("CTEST_SCRIPT_NAME", cmSystemTools::GetFilenameName(script).c_str());
cmSystemTools::GetFilenameName( m_Makefile->AddDefinition("CTEST_EXECUTABLE_NAME",
script).c_str());
m_LocalGenerator->GetMakefile()->AddDefinition("CTEST_EXECUTABLE_NAME",
m_CTest->GetCTestExecutable()); m_CTest->GetCTestExecutable());
m_Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", true);
this->UpdateElapsedTime(); this->UpdateElapsedTime();
// add any ctest specific commands, probably should have common superclass // add any ctest specific commands, probably should have common superclass
@ -223,17 +221,16 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
// add the script arg if defined // add the script arg if defined
if (script_arg.size()) if (script_arg.size())
{ {
m_LocalGenerator->GetMakefile()->AddDefinition( m_Makefile->AddDefinition("CTEST_SCRIPT_ARG", script_arg.c_str());
"CTEST_SCRIPT_ARG", script_arg.c_str());
} }
// always add a function blocker to update the elapsed time // always add a function blocker to update the elapsed time
cmCTestScriptFunctionBlocker *f = new cmCTestScriptFunctionBlocker(); cmCTestScriptFunctionBlocker *f = new cmCTestScriptFunctionBlocker();
f->m_CTestScriptHandler = this; f->m_CTestScriptHandler = this;
m_LocalGenerator->GetMakefile()->AddFunctionBlocker(f); m_Makefile->AddFunctionBlocker(f);
// finally read in the script // finally read in the script
if (!m_LocalGenerator->GetMakefile()->ReadListFile(0, script.c_str())) if (!m_Makefile->ReadListFile(0, script.c_str()))
{ {
return 2; return 2;
} }
@ -246,9 +243,6 @@ int cmCTestScriptHandler::ReadInScript(const std::string& total_script_arg)
// extract variabels from the script to set ivars // extract variabels from the script to set ivars
int cmCTestScriptHandler::ExtractVariables() int cmCTestScriptHandler::ExtractVariables()
{ {
// get some info that should be set
m_Makefile = m_LocalGenerator->GetMakefile();
// Temporary variables // Temporary variables
const char* minInterval; const char* minInterval;
const char* contDuration; const char* contDuration;
@ -361,7 +355,9 @@ int cmCTestScriptHandler::RunConfigurationScript(const std::string& total_script
{ {
return result; return result;
} }
if (!m_ScriptHasRun)
// only run the curent script if we should
if (m_Makefile && m_Makefile->IsOn("CTEST_RUN_CURRENT_SCRIPT"))
{ {
return this->RunCurrentScript(); return this->RunCurrentScript();
} }
@ -372,7 +368,8 @@ int cmCTestScriptHandler::RunCurrentScript()
{ {
int result; int result;
m_ScriptHasRun = true; // do not run twice
m_Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", false);
// no popup widows // no popup widows
cmSystemTools::SetRunCommandHideConsole(true); cmSystemTools::SetRunCommandHideConsole(true);

1
Source/CTest/cmCTestScriptHandler.h
View File

@ -121,7 +121,6 @@ private:
bool m_Backup; bool m_Backup;
bool m_EmptyBinDir; bool m_EmptyBinDir;
bool m_EmptyBinDirOnce; bool m_EmptyBinDirOnce;
bool m_ScriptHasRun;
cmStdString m_SourceDir; cmStdString m_SourceDir;
cmStdString m_BinaryDir; cmStdString m_BinaryDir;