Revert r10280, which caused https://code.google.com/p/skia/issues/detail?id=1441

tests/skia_test.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
 #include "SkOSFile.h"
@@ skipping 141 matching lines @@
           sk_atomic_inc(fFailCount);
       }
       SkDELETE(this);
   }
 
 private:
     SkAutoTDelete<Test> fTest;
     int32_t* fFailCount;
 };
 
+/* Takes a list of the form [~][^]match[$]
+   ~ causes a matching test to always be skipped
+   ^ requires the start of the test to match
+   $ requires the end of the test to match
+   ^ and $ requires an exact match
+   If a test does not match any list entry, it is skipped unless some list entry starts with ~
+ */
+static bool shouldSkip(const char* testName) {
+    int count = FLAGS_match.count();
+    size_t testLen = strlen(testName);
+    bool anyExclude = count == 0;
+    for (int index = 0; index < count; ++index) {
+        const char* matchName = FLAGS_match[index];
+        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(testName, matchName, matchLen) == 0
+                : matchEnd ? matchLen <= testLen
+                && strncmp(testName + testLen - matchLen, matchName, matchLen) == 0
+                : strstr(testName, matchName) != 0) {
+            return matchExclude;
+        }
+    }
+    return !anyExclude;
+}
+
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("");
     SkCommandLineFlags::Parse(argc, argv);
 
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = true;
 #endif
 
     SkGraphics::Init();
@@ skipping 27 matching lines @@
         SkDebugf("%s\n", header.c_str());
     }
 
     DebugfReporter reporter(FLAGS_extendedTest, !FLAGS_single, FLAGS_verbose);
     Iter iter(&reporter);
 
     // Count tests first.
     int total = 0;
     int toRun = 0;
     Test* test;
-
-    SkTDArray<const char*> matchStrs;
-    for(int i = 0; i < FLAGS_match.count(); ++i) {
-        matchStrs.push(FLAGS_match[i]);
-    }
-
     while ((test = iter.next()) != NULL) {
         SkAutoTDelete<Test> owned(test);
-
-        if(!SkCommandLineFlags::ShouldSkip(matchStrs, test->getName())) {
+        if(!shouldSkip(test->getName())) {
             toRun++;
         }
         total++;
     }
     reporter.setTotal(toRun);
 
     // Now run them.
     iter.reset();
     int32_t failCount = 0;
     int skipCount = 0;
 
     SkAutoTDelete<SkThreadPool> threadpool(SkNEW_ARGS(SkThreadPool, (FLAGS_threads)));
     SkTArray<Test*> unsafeTests;  // Always passes ownership to an SkTestRunnable
     for (int i = 0; i < total; i++) {
         SkAutoTDelete<Test> test(iter.next());
-        if (SkCommandLineFlags::ShouldSkip(matchStrs, test->getName())) {
+        if (shouldSkip(test->getName())) {
             ++skipCount;
         } else if (!test->isThreadsafe()) {
             unsafeTests.push_back() = test.detach();
         } else {
             threadpool->add(SkNEW_ARGS(SkTestRunnable, (test.detach(), &failCount)));
         }
     }
 
     // Run the tests that aren't threadsafe.
     for (int i = 0; i < unsafeTests.count(); i++) {
@@ skipping 23 matching lines @@
     GpuTest::DestroyContexts();
 
     return (failCount == 0) ? 0 : 1;
 }
 
 #if !defined(SK_BUILD_FOR_IOS) && !defined(SK_BUILD_FOR_NACL)
 int main(int argc, char * const argv[]) {
     return tool_main(argc, (char**) argv);
 }
 #endif