Added v4 verbosity level
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@414 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -59,7 +59,7 @@ public:
|
|||||||
int Run(int argc, char *argv[]);
|
int Run(int argc, char *argv[]);
|
||||||
|
|
||||||
// Verbosity Level enumeration and accessor function
|
// Verbosity Level enumeration and accessor function
|
||||||
enum VerbosityLevel { v0, v1, v2, v3 };
|
enum VerbosityLevel { v0, v1, v2, v3, v4 };
|
||||||
VerbosityLevel Verbosity() const;
|
VerbosityLevel Verbosity() const;
|
||||||
|
|
||||||
// Returns true if verbosity is high enough that individual tests are
|
// Returns true if verbosity is high enough that individual tests are
|
||||||
|
|||||||
@@ -42,11 +42,15 @@ BTestShell::AddSuite(BTestSuite *suite) {
|
|||||||
fSuites[suite->getName()] = suite;
|
fSuites[suite->getName()] = suite;
|
||||||
|
|
||||||
// Add its tests
|
// Add its tests
|
||||||
|
bool first = true;
|
||||||
const TestMap &map = suite->getTests();
|
const TestMap &map = suite->getTests();
|
||||||
for (TestMap::const_iterator i = map.begin();
|
for (TestMap::const_iterator i = map.begin();
|
||||||
i != map.end();
|
i != map.end();
|
||||||
i++)
|
i++) {
|
||||||
AddTest(i->first, i->second);
|
AddTest(i->first, i->second);
|
||||||
|
if (Verbosity() >= v4 && i->second)
|
||||||
|
cout << " " << i->first << endl;
|
||||||
|
}
|
||||||
|
|
||||||
return B_OK;
|
return B_OK;
|
||||||
} else
|
} else
|
||||||
@@ -213,8 +217,10 @@ BTestShell::PrintValidArguments() {
|
|||||||
cout << indent << "-v1 Sets verbosity level to 1 (complete summary only)" << endl;
|
cout << indent << "-v1 Sets verbosity level to 1 (complete summary only)" << endl;
|
||||||
cout << indent << "-v2 Sets verbosity level to 2 (*default* -- per-test results plus" << endl;
|
cout << indent << "-v2 Sets verbosity level to 2 (*default* -- per-test results plus" << endl;
|
||||||
cout << indent << " complete summary)" << endl;
|
cout << indent << " complete summary)" << endl;
|
||||||
cout << indent << "-v3 Sets verbosity level to 3 (dynamic loading information, per-test " << endl;
|
cout << indent << "-v3 Sets verbosity level to 3 (partial dynamic loading information, " << endl;
|
||||||
cout << indent << " results and timing info, plus complete summary)" << endl;
|
cout << indent << " per-test results and timing info, plus complete summary)" << endl;
|
||||||
|
cout << indent << "-v4 Sets verbosity level to 4 (complete dynamic loading information, " << endl;
|
||||||
|
cout << indent << " per-test results and timing info, plus complete summary)" << endl;
|
||||||
cout << indent << "NAME Instructs the program to run the test for the given class or all" << endl;
|
cout << indent << "NAME Instructs the program to run the test for the given class or all" << endl;
|
||||||
cout << indent << " the tests for the given suite. If some bonehead adds both a class" << endl;
|
cout << indent << " the tests for the given suite. If some bonehead adds both a class" << endl;
|
||||||
cout << indent << " and a suite with the same name, the suite will be run, not the class" << endl;
|
cout << indent << " and a suite with the same name, the suite will be run, not the class" << endl;
|
||||||
@@ -270,21 +276,18 @@ BTestShell::ProcessArgument(std::string arg, int argc, char *argv[]) {
|
|||||||
PrintDescription(argc, argv);
|
PrintDescription(argc, argv);
|
||||||
PrintHelp();
|
PrintHelp();
|
||||||
return false;
|
return false;
|
||||||
}
|
} else if (arg == "--list") {
|
||||||
else if (arg == "--list") {
|
|
||||||
fListTestsAndExit = true;
|
fListTestsAndExit = true;
|
||||||
}
|
} else if (arg == "-v0") {
|
||||||
else if (arg == "-v0") {
|
|
||||||
fVerbosityLevel = v0;
|
fVerbosityLevel = v0;
|
||||||
}
|
} else if (arg == "-v1") {
|
||||||
else if (arg == "-v1") {
|
|
||||||
fVerbosityLevel = v1;
|
fVerbosityLevel = v1;
|
||||||
}
|
} else if (arg == "-v2") {
|
||||||
else if (arg == "-v2") {
|
|
||||||
fVerbosityLevel = v2;
|
fVerbosityLevel = v2;
|
||||||
}
|
} else if (arg == "-v3") {
|
||||||
else if (arg == "-v3") {
|
|
||||||
fVerbosityLevel = v3;
|
fVerbosityLevel = v3;
|
||||||
|
} else if (arg == "-v4") {
|
||||||
|
fVerbosityLevel = v4;
|
||||||
} else if (arg.length() >= 2 && arg[0] == '-' && arg[1] == 'l') {
|
} else if (arg.length() >= 2 && arg[0] == '-' && arg[1] == 'l') {
|
||||||
fLibDirs.insert(arg.substr(2, arg.size()-2));
|
fLibDirs.insert(arg.substr(2, arg.size()-2));
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user