ENH: Refactor storage of test command lines

We used to separate the command executable from its argument vector.
It is simpler to just store the whole command line in one vector.
This commit is contained in:
Brad King
2009-03-16 10:42:40 -04:00
parent 66d69f864a
commit 606e6ff9cd
4 changed files with 21 additions and 32 deletions

View File

@@ -33,15 +33,13 @@ bool cmAddTestCommand
this->SetError("called with incorrect number of arguments");
return false;
}
// store the arguments for the final pass
// also expand any CMake variables
std::vector<cmStdString> arguments;
std::vector<std::string>::const_iterator it;
for ( it = args.begin() + 2; it != args.end(); ++ it )
// Collect the command with arguments.
std::vector<std::string> command;
for(std::vector<std::string>::const_iterator it = args.begin() + 1;
it != args.end(); ++it)
{
arguments.push_back(*it);
command.push_back(*it);
}
// Create the test but add a generator only the first time it is
@@ -52,8 +50,7 @@ bool cmAddTestCommand
test = this->Makefile->CreateTest(args[0].c_str());
this->Makefile->AddTestGenerator(new cmTestGenerator(test));
}
test->SetCommand(args[1].c_str());
test->SetArguments(arguments);
test->SetCommand(command);
return true;
}