Reland "Add --skip_cpu and --skip_gpu options to tests"

Reland "Add --skip_cpu and --skip_gpu options to tests"

NOTRY=true

BUG=skia:2074
Committed: http://code.google.com/p/skia/source/detail?r=13237

[borenet, 2014-01-28 20:31:18]

https://codereview.chromium.org/135163004/diff/1/tests/skia_test.cpp
File tests/skia_test.cpp (right):

https://codereview.chromium.org/135163004/diff/1/tests/skia_test.cpp#newcode208
tests/skia_test.cpp:208: } else if (test->isGPUTest()) {
Accidentally left this inverted last time.

[mtklein, 2014-01-28 20:39:04]

lgtm

[commit-bot: I haz the power, 2014-01-30 14:37:07]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/borenet@google.com/135163004/1

[commit-bot: I haz the power, 2014-01-30 14:37:09]

Failed to apply patch for tests/skia_test.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file tests/skia_test.cpp
  Hunk #1 FAILED at 35.
  Hunk #2 succeeded at 125 (offset 1 line).
  Hunk #3 succeeded at 185 (offset 1 line).
  Hunk #4 succeeded at 202 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file tests/skia_test.cpp.rej

Patch:       tests/skia_test.cpp
Index: tests/skia_test.cpp
diff --git a/tests/skia_test.cpp b/tests/skia_test.cpp
index
fd7f3a356b3367f32c6f12d43ee73dfa1f1f2cda..40f08603894643f718d4f2257bc3b6c155153cf2
100644
--- a/tests/skia_test.cpp
+++ b/tests/skia_test.cpp
@@ -35,6 +35,8 @@ 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.");
 
@@ -124,6 +126,19 @@ private:
     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("");
@@ -171,8 +186,7 @@ int tool_main(int argc, char** argv) {
     Iter iter;
     while ((test = iter.next(NULL/*reporter not needed*/)) != NULL) {
         SkAutoTDelete<Test> owned(test);
-
-        if(!SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) {
+        if (should_run(test->getName(), test->isGPUTest())) {
             toRun++;
         }
         total++;
@@ -189,9 +203,9 @@ int tool_main(int argc, char** argv) {
     DebugfReporter reporter(toRun);
     for (int i = 0; i < total; i++) {
         SkAutoTDelete<Test> test(iter.next(&reporter));
-        if (SkCommandLineFlags::ShouldSkip(FLAGS_match, test->getName())) {
+        if (!should_run(test->getName(), test->isGPUTest())) {
             ++skipCount;
-        } else if (!test->isThreadsafe()) {
+        } else if (test->isGPUTest()) {
             unsafeTests.push_back() = test.detach();
         } else {
             threadpool.add(SkNEW_ARGS(SkTestRunnable, (test.detach(),
&failCount)));

[commit-bot: I haz the power, 2014-01-30 14:37:11]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-01-30 15:15:40]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/borenet@google.com/135163004/20001

[commit-bot: I haz the power, 2014-01-30 15:30:08]

CQ bit was unchecked on CL. Ignoring.

[commit-bot: I haz the power, 2014-01-30 15:30:46]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/borenet@google.com/135163004/20001

[commit-bot: I haz the power, 2014-01-30 15:30:52]

Change committed as 13237