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

cmCTest: Facilitate code reading adding consistent comments in Run()

This commit is contained in:
Jean-Christophe Fillion-Robin 2016-06-20 20:40:55 -04:00 committed by Brad King
parent 6d8b9aa65a
commit 7c87ab755c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmCTest.cxx
View File

@ -2018,7 +2018,7 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
// handle the script arguments -S -SR -SP // handle the script arguments -S -SR -SP
this->HandleScriptArguments(i, args, SRArgumentSpecified); this->HandleScriptArguments(i, args, SRArgumentSpecified);
// handle a request for a dashboard // --dashboard: handle a request for a dashboard
std::string arg = args[i]; std::string arg = args[i];
if (this->CheckArgument(arg, "-D", "--dashboard") && i < args.size() - 1) { if (this->CheckArgument(arg, "-D", "--dashboard") && i < args.size() - 1) {
this->ProduceXML = true; this->ProduceXML = true;
@ -2044,17 +2044,18 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
this->AddVariableDefinition(input); this->AddVariableDefinition(input);
} }
// calls SetTest(<stage>, /*report=*/ false) to enable the corresponding // --test-action: calls SetTest(<stage>, /*report=*/ false) to enable
// stage. <stage> is a string like 'All', 'Start', or 'Udpate'. // the corresponding stage
if (!this->HandleTestActionArgument(ctestExec, i, args)) { if (!this->HandleTestActionArgument(ctestExec, i, args)) {
executeTests = false; executeTests = false;
} }
// what type of test model // --test-model: what type of test model
if (!this->HandleTestModelArgument(ctestExec, i, args)) { if (!this->HandleTestModelArgument(ctestExec, i, args)) {
executeTests = false; executeTests = false;
} }
// --extra-submit
if (this->CheckArgument(arg, "--extra-submit") && i < args.size() - 1) { if (this->CheckArgument(arg, "--extra-submit") && i < args.size() - 1) {
this->ProduceXML = true; this->ProduceXML = true;
this->SetTest("Submit"); this->SetTest("Submit");
@ -2069,6 +2070,7 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
cmakeAndTest = true; cmakeAndTest = true;
} }
// --schedule-random
if (this->CheckArgument(arg, "--schedule-random")) { if (this->CheckArgument(arg, "--schedule-random")) {
this->ScheduleType = "Random"; this->ScheduleType = "Random";
} }
@ -2087,6 +2089,7 @@ int cmCTest::Run(std::vector<std::string>& args, std::string* output)
} }
} // the close of the for argument loop } // the close of the for argument loop
// handle CTEST_PARALLEL_LEVEL environment variable
if (!this->ParallelLevelSetInCli) { if (!this->ParallelLevelSetInCli) {
if (const char* parallel = cmSystemTools::GetEnv("CTEST_PARALLEL_LEVEL")) { if (const char* parallel = cmSystemTools::GetEnv("CTEST_PARALLEL_LEVEL")) {
int plevel = atoi(parallel); int plevel = atoi(parallel);