diff options
Diffstat (limited to 'Source/CTest/cmCTestRunScriptCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestRunScriptCommand.cxx | 42 |
1 files changed, 15 insertions, 27 deletions
diff --git a/Source/CTest/cmCTestRunScriptCommand.cxx b/Source/CTest/cmCTestRunScriptCommand.cxx index 7afbe04..e143d50 100644 --- a/Source/CTest/cmCTestRunScriptCommand.cxx +++ b/Source/CTest/cmCTestRunScriptCommand.cxx @@ -13,53 +13,41 @@ #include "cmCTestScriptHandler.h" -bool cmCTestRunScriptCommand -::InitialPass(std::vector<std::string> const& args, cmExecutionStatus &) +bool cmCTestRunScriptCommand::InitialPass(std::vector<std::string> const& args, + cmExecutionStatus&) { - if(args.size() < 1 ) - { + if (args.size() < 1) { this->CTestScriptHandler->RunCurrentScript(); return true; - } + } bool np = false; unsigned int i = 0; - if (args[i] == "NEW_PROCESS") - { + if (args[i] == "NEW_PROCESS") { np = true; i++; - } + } int start = i; // run each script std::string returnVariable; - for (i = start; i < args.size(); ++i) - { - if(args[i] == "RETURN_VALUE") - { + for (i = start; i < args.size(); ++i) { + if (args[i] == "RETURN_VALUE") { ++i; - if(i < args.size()) - { + if (i < args.size()) { returnVariable = args[i]; - } } } - for (i = start; i < args.size(); ++i) - { - if(args[i] == "RETURN_VALUE") - { + } + for (i = start; i < args.size(); ++i) { + if (args[i] == "RETURN_VALUE") { ++i; - } - else - { + } else { int ret; - cmCTestScriptHandler::RunScript(this->CTest, args[i].c_str(), !np, - &ret); + cmCTestScriptHandler::RunScript(this->CTest, args[i].c_str(), !np, &ret); std::ostringstream str; str << ret; this->Makefile->AddDefinition(returnVariable, str.str().c_str()); - } } + } return true; } - - |