Revert of Add --skip_cpu and --skip_gpu options to tests

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 "OverwriteLine.h"
 #include "SkCommandLineFlags.h"
 #include "SkGraphics.h"
@@ skipping 17 matching lines @@
                                "$ requires the end of the test to match\n" \
                                "^ and $ requires an exact match\n" \
                                "If a test does not match any list entry,\n" \
                                "it is skipped unless some list entry starts with ~");
 DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
 DEFINE_string2(resourcePath, i, "resources", "directory for test resources.");
 DEFINE_bool2(extendedTest, x, false, "run extended tests for pathOps.");
 DEFINE_bool2(leaks, l, false, "show leaked ref cnt'd objects.");
 DEFINE_bool2(single, z, false, "run tests on a single thread internally.");
 DEFINE_bool2(verbose, v, false, "enable verbose output.");
-DEFINE_bool(cpu, true, "whether or not to run CPU tests.");
-DEFINE_bool(gpu, true, "whether or not to run GPU tests.");
 DEFINE_int32(threads, SkThreadPool::kThreadPerCore,
              "Run threadsafe tests on a threadpool with this many threads.");
 
 // need to explicitly declare this, or we get some weird infinite loop llist
 template TestRegistry* TestRegistry::gHead;
 
 class Iter {
 public:
     Iter() { this->reset(); }
     void reset() { fReg = TestRegistry::Head(); }
@@ skipping 69 matching lines @@
           sk_atomic_inc(fFailCount);
       }
       SkDELETE(this);
   }
 
 private:
     SkAutoTDelete<Test> fTest;
     int32_t* fFailCount;
 };
 
-static bool should_run(const char* testName, bool isGPUTest) {
-    if (SkCommandLineFlags::ShouldSkip(FLAGS_match, testName)) {
-        return false;
-    }
-    if (!FLAGS_cpu && !isGPUTest) {
-        return false;
-    }
-    if (!FLAGS_gpu && isGPUTest) {
-        return false;
-    }
-    return true;
-}
-
 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
     if (FLAGS_leaks) {
         gPrintInstCount = true;
     }
 #endif
@@ skipping 27 matching lines @@
 
 
     // Count tests first.
     int total = 0;
     int toRun = 0;
     Test* test;
 
     Iter iter;
     while ((test = iter.next(NULL/*reporter not needed*/)) != NULL) {
         SkAutoTDelete<Test> owned(test);
-        if (should_run(test->getName(), test->isGPUTest())) {
+
+        if(!SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) {
             toRun++;
         }
         total++;
     }
 
     // Now run them.
     iter.reset();
     int32_t failCount = 0;
     int skipCount = 0;
 
     SkThreadPool threadpool(FLAGS_threads);
     SkTArray<Test*> unsafeTests;  // Always passes ownership to an SkTestRunnable
 
     DebugfReporter reporter(toRun);
     for (int i = 0; i < total; i++) {
         SkAutoTDelete<Test> test(iter.next(&reporter));
-        if (!should_run(test->getName(), test->isGPUTest())) {
+        if (SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) {
             ++skipCount;
-        } else if (!test->isGPUTest()) {
+        } 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++) {
         SkNEW_ARGS(SkTestRunnable, (unsafeTests[i], &failCount))->run();
     }
@@ skipping 10 matching lines @@
 
     SkDebugf("\n");
     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