AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

restore option to --match (instead of --matchStr)

Browse Source 
git-svn-id: http://skia.googlecode.com/svn/trunk@8624 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
reed@google.com 2013-04-11 18:27:52 +00:00
parent 0b9832653e
commit 9aff14831b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/skia_test.cpp
View File

@ -122,7 +122,7 @@ const SkString& Test::GetResourcePath() {
return gResourcePath;
}
DEFINE_string2(matchStr, m, NULL, "substring of test name to run.");
DEFINE_string2(match, m, NULL, "substring of test name to run.");
DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
DEFINE_string2(resourcePath, i, NULL, "directory for test resources.");
DEFINE_bool2(extendedTest, x, false, "run extended tests for pathOps.");
@ -148,8 +148,8 @@ int tool_main(int argc, char** argv) {
{
SkString header("Skia UnitTests:");
if (!FLAGS_matchStr.isEmpty()) {
header.appendf(" --match %s", FLAGS_matchStr[0]);
if (!FLAGS_match.isEmpty()) {
header.appendf(" --match %s", FLAGS_match[0]);
}
if (!gTmpDir.isEmpty()) {
header.appendf(" --tmpDir %s", gTmpDir.c_str());
@ -180,7 +180,7 @@ int tool_main(int argc, char** argv) {
int skipCount = 0;
while ((test = iter.next()) != NULL) {
reporter.setIndexOfTotal(index, count);
if (!FLAGS_matchStr.isEmpty() && !strstr(test->getName(), FLAGS_matchStr[0])) {
if (!FLAGS_match.isEmpty() && !strstr(test->getName(), FLAGS_match[0])) {
++skipCount;
} else {
if (!test->run()) {