summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestBuildCommand.cxx18
-rw-r--r--Source/CTest/cmCTestConfigureCommand.cxx10
-rw-r--r--Source/CTest/cmCTestCoverageCommand.cxx4
-rw-r--r--Source/CTest/cmCTestHandlerCommand.cxx2
-rw-r--r--Source/CTest/cmCTestMemCheckCommand.cxx6
-rw-r--r--Source/CTest/cmCTestStartCommand.cxx6
-rw-r--r--Source/CTest/cmCTestSubmitCommand.cxx20
-rw-r--r--Source/CTest/cmCTestTestCommand.cxx3
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx2
-rw-r--r--Source/CTest/cmCTestUpdateCommand.cxx18
10 files changed, 45 insertions, 44 deletions
diff --git a/Source/CTest/cmCTestBuildCommand.cxx b/Source/CTest/cmCTestBuildCommand.cxx
index 91cb366..b323881 100644
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@@ -103,7 +103,7 @@ bool cmCTestBuildCommand::InitialPass(
}
const char* ctestBuildCommand
- = m_Makefile->GetDefinition("CTEST_BUILD_COMMAND");
+ = this->Makefile->GetDefinition("CTEST_BUILD_COMMAND");
if ( ctestBuildCommand && *ctestBuildCommand )
{
this->CTest->SetCTestConfiguration("MakeCommand", ctestBuildCommand);
@@ -111,13 +111,13 @@ bool cmCTestBuildCommand::InitialPass(
else
{
const char* cmakeGeneratorName
- = m_Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
+ = this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
const char* cmakeProjectName
- = m_Makefile->GetDefinition("CTEST_PROJECT_NAME");
+ = this->Makefile->GetDefinition("CTEST_PROJECT_NAME");
const char* cmakeBuildConfiguration
- = m_Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
+ = this->Makefile->GetDefinition("CTEST_BUILD_CONFIGURATION");
const char* cmakeBuildAdditionalFlags
- = m_Makefile->GetDefinition("CTEST_BUILD_FLAGS");
+ = this->Makefile->GetDefinition("CTEST_BUILD_FLAGS");
if ( cmakeGeneratorName && *cmakeGeneratorName &&
cmakeProjectName && *cmakeProjectName )
{
@@ -137,12 +137,12 @@ bool cmCTestBuildCommand::InitialPass(
if ( !this->GlobalGenerator )
{
this->GlobalGenerator =
- m_Makefile->GetCMakeInstance()->CreateGlobalGenerator(
+ this->Makefile->GetCMakeInstance()->CreateGlobalGenerator(
cmakeGeneratorName);
}
- this->GlobalGenerator->FindMakeProgram(m_Makefile);
+ this->GlobalGenerator->FindMakeProgram(this->Makefile);
const char* cmakeMakeProgram
- = m_Makefile->GetDefinition("CMAKE_MAKE_PROGRAM");
+ = this->Makefile->GetDefinition("CMAKE_MAKE_PROGRAM");
std::string buildCommand
= this->GlobalGenerator->GenerateBuildCommand(cmakeMakeProgram,
cmakeProjectName,
@@ -166,7 +166,7 @@ bool cmCTestBuildCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(res_var, str.str().c_str());
+ this->Makefile->AddDefinition(res_var, str.str().c_str());
}
return true;
}
diff --git a/Source/CTest/cmCTestConfigureCommand.cxx b/Source/CTest/cmCTestConfigureCommand.cxx
index dd95cc0..2d5a16f 100644
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@@ -92,7 +92,7 @@ bool cmCTestConfigureCommand::InitialPass(
}
else
{
- source_dir = m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY");
+ source_dir = this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY");
}
if ( build_dir )
@@ -101,7 +101,7 @@ bool cmCTestConfigureCommand::InitialPass(
}
else
{
- build_dir = m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY");
+ build_dir = this->Makefile->GetDefinition("CTEST_BINARY_DIRECTORY");
if ( !build_dir )
{
this->SetError("Build directory not specified. Either use BUILD "
@@ -113,7 +113,7 @@ bool cmCTestConfigureCommand::InitialPass(
const char* ctestConfigureCommand
- = m_Makefile->GetDefinition("CTEST_CONFIGURE_COMMAND");
+ = this->Makefile->GetDefinition("CTEST_CONFIGURE_COMMAND");
if ( ctestConfigureCommand && *ctestConfigureCommand )
{
this->CTest->SetCTestConfiguration("ConfigureCommand",
@@ -122,7 +122,7 @@ bool cmCTestConfigureCommand::InitialPass(
else
{
const char* cmakeGeneratorName
- = m_Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
+ = this->Makefile->GetDefinition("CTEST_CMAKE_GENERATOR");
if ( cmakeGeneratorName && *cmakeGeneratorName )
{
std::string cmakeConfigureCommand = "\"";
@@ -157,7 +157,7 @@ bool cmCTestConfigureCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(res_var, str.str().c_str());
+ this->Makefile->AddDefinition(res_var, str.str().c_str());
}
return true;
}
diff --git a/Source/CTest/cmCTestCoverageCommand.cxx b/Source/CTest/cmCTestCoverageCommand.cxx
index 602bad1..c70c4cf 100644
--- a/Source/CTest/cmCTestCoverageCommand.cxx
+++ b/Source/CTest/cmCTestCoverageCommand.cxx
@@ -74,7 +74,7 @@ bool cmCTestCoverageCommand::InitialPass(
this->CTest->SetCTestConfiguration("BuildDirectory", build_dir);
}
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"CoverageCommand", "CTEST_COVERAGE_COMMAND");
cmCTestGenericHandler* handler
@@ -92,7 +92,7 @@ bool cmCTestCoverageCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(res_var, str.str().c_str());
+ this->Makefile->AddDefinition(res_var, str.str().c_str());
}
cmSystemTools::ChangeDirectory(current_dir.c_str());
return true;
diff --git a/Source/CTest/cmCTestHandlerCommand.cxx b/Source/CTest/cmCTestHandlerCommand.cxx
index 91bcb6c..10d58ae 100644
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@@ -81,7 +81,7 @@ bool cmCTestHandlerCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(
+ this->Makefile->AddDefinition(
this->Values[ct_RETURN_VALUE], str.str().c_str());
}
cmSystemTools::ChangeDirectory(current_dir.c_str());
diff --git a/Source/CTest/cmCTestMemCheckCommand.cxx b/Source/CTest/cmCTestMemCheckCommand.cxx
index a2e33a0..2e1c084 100644
--- a/Source/CTest/cmCTestMemCheckCommand.cxx
+++ b/Source/CTest/cmCTestMemCheckCommand.cxx
@@ -25,11 +25,11 @@ cmCTestGenericHandler* cmCTestMemCheckCommand::InitializeActualHandler()
cmCTestGenericHandler* handler
= this->CTest->GetInitializedHandler("memcheck");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"MemoryCheckCommand", "CTEST_MEMORYCHECK_COMMAND");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"MemoryCheckCommandOptions", "CTEST_MEMORYCHECK_COMMAND_OPTIONS");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"MemoryCheckSuppressionFile", "CTEST_MEMORYCHECK_SUPPRESSIONS_FILE");
return handler;
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx
index 38b5cd7..515cf75 100644
--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@@ -48,11 +48,11 @@ bool cmCTestStartCommand::InitialPass(
}
if ( !src_dir )
{
- src_dir = m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY");
+ src_dir = this->Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY");
}
if ( !bld_dir)
{
- bld_dir = m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY");
+ bld_dir = this->Makefile->GetDefinition("CTEST_BINARY_DIRECTORY");
}
if ( !src_dir )
{
@@ -75,7 +75,7 @@ bool cmCTestStartCommand::InitialPass(
<< " Source directory: " << src_dir << std::endl
<< " Build directory: " << bld_dir << std::endl);
- m_Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", "OFF");
+ this->Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", "OFF");
this->CTest->SetSuppressUpdatingCTestConfiguration(true);
int model = this->CTest->GetTestModelFromString(smodel);
this->CTest->SetTestModel(model);
diff --git a/Source/CTest/cmCTestSubmitCommand.cxx b/Source/CTest/cmCTestSubmitCommand.cxx
index e28522e..5663bc4 100644
--- a/Source/CTest/cmCTestSubmitCommand.cxx
+++ b/Source/CTest/cmCTestSubmitCommand.cxx
@@ -53,13 +53,13 @@ bool cmCTestSubmitCommand::InitialPass(
}
const char* ctestDropMethod
- = m_Makefile->GetDefinition("CTEST_DROP_METHOD");
+ = this->Makefile->GetDefinition("CTEST_DROP_METHOD");
const char* ctestDropSite
- = m_Makefile->GetDefinition("CTEST_DROP_SITE");
+ = this->Makefile->GetDefinition("CTEST_DROP_SITE");
const char* ctestDropLocation
- = m_Makefile->GetDefinition("CTEST_DROP_LOCATION");
+ = this->Makefile->GetDefinition("CTEST_DROP_LOCATION");
const char* ctestTriggerSite
- = m_Makefile->GetDefinition("CTEST_TRIGGER_SITE");
+ = this->Makefile->GetDefinition("CTEST_TRIGGER_SITE");
if ( !ctestDropMethod )
{
@@ -86,15 +86,15 @@ bool cmCTestSubmitCommand::InitialPass(
this->CTest->SetCTestConfiguration("DropLocation", ctestDropLocation);
this->CTest->SetCTestConfiguration("TriggerSite", ctestTriggerSite);
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"DropSiteUser", "CTEST_DROP_SITE_USER");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"DropSitePassword", "CTEST_DROP_SITE_PASSWORD");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"ScpCommand", "CTEST_SCP_COMMAND");
const char* notesFilesVariable
- = m_Makefile->GetDefinition("CTEST_NOTES_FILES");
+ = this->Makefile->GetDefinition("CTEST_NOTES_FILES");
if (notesFilesVariable)
{
std::vector<std::string> notesFiles;
@@ -110,7 +110,7 @@ bool cmCTestSubmitCommand::InitialPass(
this->CTest->GenerateNotesFile(newNotesFiles);
}
const char* extraFilesVariable
- = m_Makefile->GetDefinition("CTEST_EXTRA_SUBMIT_FILES");
+ = this->Makefile->GetDefinition("CTEST_EXTRA_SUBMIT_FILES");
if (extraFilesVariable)
{
std::vector<std::string> extraFiles;
@@ -142,7 +142,7 @@ bool cmCTestSubmitCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(res_var, str.str().c_str());
+ this->Makefile->AddDefinition(res_var, str.str().c_str());
}
return true;
}
diff --git a/Source/CTest/cmCTestTestCommand.cxx b/Source/CTest/cmCTestTestCommand.cxx
index f839b69..4c962e9 100644
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@@ -30,7 +30,8 @@ cmCTestTestCommand::cmCTestTestCommand()
cmCTestGenericHandler* cmCTestTestCommand::InitializeHandler()
{
- const char* ctestTimeout = m_Makefile->GetDefinition("CTEST_TEST_TIMEOUT");
+ const char* ctestTimeout =
+ this->Makefile->GetDefinition("CTEST_TEST_TIMEOUT");
double timeout = this->CTest->GetTimeOut();
if ( ctestTimeout )
{
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index fe412e2..af7ed42 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -111,7 +111,7 @@ bool cmCTestSubdirCommand::InitialPass(std::vector<std::string> const& args)
}
fname += "/";
fname += testFilename;
- bool readit = m_Makefile->ReadListFile( m_Makefile->GetCurrentListFile(),
+ bool readit = this->Makefile->ReadListFile( this->Makefile->GetCurrentListFile(),
fname.c_str());
cmSystemTools::ChangeDirectory(cwd.c_str());
if(!readit)
diff --git a/Source/CTest/cmCTestUpdateCommand.cxx b/Source/CTest/cmCTestUpdateCommand.cxx
index 69ddb10..94a79b9 100644
--- a/Source/CTest/cmCTestUpdateCommand.cxx
+++ b/Source/CTest/cmCTestUpdateCommand.cxx
@@ -69,24 +69,24 @@ bool cmCTestUpdateCommand::InitialPass(
}
}
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"UpdateCommand", "CTEST_UPDATE_COMMAND");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"UpdateOptions", "CTEST_UPDATE_OPTIONS");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"CVSCommand", "CTEST_CVS_COMMAND");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"CVSUpdateOptions", "CTEST_CVS_UPDATE_OPTIONS");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"SVNCommand", "CTEST_SVN_COMMAND");
- this->CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile,
+ this->CTest->SetCTestConfigurationFromCMakeVariable(this->Makefile,
"SVNUpdateOptions", "CTEST_SVN_UPDATE_OPTIONS");
const char* initialCheckoutCommand
- = m_Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
+ = this->Makefile->GetDefinition("CTEST_CHECKOUT_COMMAND");
if ( !initialCheckoutCommand )
{
- initialCheckoutCommand = m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
+ initialCheckoutCommand = this->Makefile->GetDefinition("CTEST_CVS_CHECKOUT");
}
cmCTestGenericHandler* handler
@@ -126,7 +126,7 @@ bool cmCTestUpdateCommand::InitialPass(
{
cmOStringStream str;
str << res;
- m_Makefile->AddDefinition(res_var, str.str().c_str());
+ this->Makefile->AddDefinition(res_var, str.str().c_str());
}
return true;
}
generated by cgit v0.12 at 2024-11-10 22:34:10 (GMT)