ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix --test argument passing.

Browse Source
This commit is contained in:
Arthur Britto
2012-05-18 12:35:40 -07:00
parent 4d2cb23e35
commit b15cbb3cdc
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main.cpp
View File

@@ -59,6 +59,7 @@ int main(int argc, char* argv[])
{ {
int iResult = 0; int iResult = 0;
po::variables_map vm; // Map of options. po::variables_map vm; // Map of options.
bool bTest = false;
// //
// Set up option parsing. // Set up option parsing.
@@ -86,9 +87,16 @@ int main(int argc, char* argv[])
iResult = 2; iResult = 2;
} }
// Parse options, if no error. if (iResult)
if (!iResult)
{ {
nothing();
}
else if (argc >= 2 && !strcmp(argv[1], "--test")) {
bTest = true;
}
else
{
// Parse options, if no error.
po::store(po::command_line_parser(argc, argv) po::store(po::command_line_parser(argc, argv)
.options(desc) // Parse options. .options(desc) // Parse options.
.positional(p) // Remainder as --parameters. .positional(p) // Remainder as --parameters.
@@ -107,22 +115,20 @@ int main(int argc, char* argv[])
} }
else if (vm.count("test")) else if (vm.count("test"))
{ {
int iCmd = vm.count("parameters"); std::cerr << "--test must be first parameter." << std::endl;
iResult = 1;
}
else if (bTest)
{
std::vector<char*> pvCmd; std::vector<char*> pvCmd;
// Copy all but "--test" at argv[1].
pvCmd.push_back(argv[0]); pvCmd.push_back(argv[0]);
if (iCmd) for (int i=1; i++ != argc; )
{ pvCmd.push_back(argv[i]);
std::vector<std::string> vCmd;
vCmd = vm["parameters"].as<std::vector<std::string> >(); iResult = unit_test_main(init_unit_test, pvCmd.size()-1, &pvCmd[0]);
BOOST_FOREACH(std::string& param, vCmd)
pvCmd.push_back(const_cast<char*>(param.c_str()));
}
iResult = unit_test_main(init_unit_test, iCmd, &pvCmd[0]);
} }
else if (!vm.count("parameters")) else if (!vm.count("parameters"))
{ {