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

CTest: Rename local variable for clarity

This commit is contained in:
David Cole 2012-06-24 05:51:08 -04:00
parent 24ba0fd078
commit af298480d0
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmCTest.cxx
View File

@ -2236,7 +2236,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
this->FindRunningCMake(); this->FindRunningCMake();
const char* ctestExec = "ctest"; const char* ctestExec = "ctest";
bool cmakeAndTest = false; bool cmakeAndTest = false;
bool performSomeTest = true; bool executeTests = true;
bool SRArgumentSpecified = false; bool SRArgumentSpecified = false;
// copy the command line // copy the command line
@ -2266,7 +2266,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
if (!this->AddTestsForDashboardType(targ)) if (!this->AddTestsForDashboardType(targ))
{ {
this->ErrorMessageUnknownDashDValue(targ); this->ErrorMessageUnknownDashDValue(targ);
performSomeTest = false; executeTests = false;
} }
} }
@ -2277,7 +2277,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
i++; i++;
if ( !this->SetTest(args[i].c_str(), false) ) if ( !this->SetTest(args[i].c_str(), false) )
{ {
performSomeTest = false; executeTests = false;
cmCTestLog(this, ERROR_MESSAGE, cmCTestLog(this, ERROR_MESSAGE,
"CTest -T called with incorrect option: " "CTest -T called with incorrect option: "
<< args[i].c_str() << std::endl); << args[i].c_str() << std::endl);
@ -2315,7 +2315,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
} }
else else
{ {
performSomeTest = false; executeTests = false;
cmCTestLog(this, ERROR_MESSAGE, cmCTestLog(this, ERROR_MESSAGE,
"CTest -M called with incorrect option: " << str.c_str() "CTest -M called with incorrect option: " << str.c_str()
<< std::endl); << std::endl);
@ -2386,8 +2386,7 @@ int cmCTest::Run(std::vector<std::string> &args, std::string* output)
return retv; return retv;
} }
// if some tests must be run if(executeTests)
if(performSomeTest)
{ {
int res; int res;
// call process directory // call process directory