refactor duplication (shouldSkip and skip_name) into a utility function
R=caryclark@google.com, reed@google.com
Committed: https://code.google.com/p/skia/source/detail?r=10280
Review URL: https://codereview.chromium.org/19807005
git-svn-id: http://skia.googlecode.com/svn/trunk@10317 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index 01eaaeb..958a511 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -1410,38 +1410,6 @@
return -1;
}
-static bool skip_name(SkCommandLineFlags::StringArray array, const char name[]) {
- // FIXME: this duplicates the logic in test/skia_test.cpp -- consolidate
- int count = array.count();
- size_t testLen = strlen(name);
- bool anyExclude = count == 0;
- for (int i = 0; i < array.count(); ++i) {
- const char* matchName = array[i];
- size_t matchLen = strlen(matchName);
- bool matchExclude, matchStart, matchEnd;
- if ((matchExclude = matchName[0] == '~')) {
- anyExclude = true;
- matchName++;
- matchLen--;
- }
- if ((matchStart = matchName[0] == '^')) {
- matchName++;
- matchLen--;
- }
- if ((matchEnd = matchName[matchLen - 1] == '$')) {
- matchLen--;
- }
- if (matchStart ? (!matchEnd || matchLen == testLen)
- && strncmp(name, matchName, matchLen) == 0
- : matchEnd ? matchLen <= testLen
- && strncmp(name + testLen - matchLen, matchName, matchLen) == 0
- : strstr(name, matchName) != 0) {
- return matchExclude;
- }
- }
- return !anyExclude;
-}
-
namespace skiagm {
#if SK_SUPPORT_GPU
SkAutoTUnref<GrContext> gGrContext;
@@ -2076,7 +2044,12 @@
}
const char* shortName = gm->shortName();
- if (skip_name(FLAGS_match, shortName)) {
+
+ SkTDArray<const char*> matchStrs;
+ for (int i = 0; i < FLAGS_match.count(); ++i) {
+ matchStrs.push(FLAGS_match[i]);
+ }
+ if (SkCommandLineFlags::ShouldSkip(matchStrs, shortName)) {
continue;
}