allow tests to optionally use multiple threads

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 "Test.h"
@@ skipping 44 matching lines @@
     Reporter* fReporter;
     const TestRegistry* fReg;
 };
 
 static const char* result2string(Reporter::Result result) {
     return result == Reporter::kPassed ? "passed" : "FAILED";
 }
 
 class DebugfReporter : public Reporter {
 public:
-    DebugfReporter(bool allowExtendedTest)
+    DebugfReporter(bool allowExtendedTest, bool allowThreaded)
         : fIndex(0)
         , fTotal(0)
-        , fAllowExtendedTest(allowExtendedTest) {
+        , fAllowExtendedTest(allowExtendedTest)
+        , fAllowThreaded(allowThreaded) {
     }
 
     void setIndexOfTotal(int index, int total) {
         fIndex = index;
         fTotal = total;
     }
 
     virtual bool allowExtendedTest() const {
         return fAllowExtendedTest;
     }
 
+    virtual bool allowThreaded() const {
+        return fAllowThreaded;
+    }
+
 protected:
     virtual void onStart(Test* test) {
         SkDebugf("[%d/%d] %s...\n", fIndex+1, fTotal, test->getName());
     }
     virtual void onReport(const char desc[], Reporter::Result result) {
         SkDebugf("\t%s: %s\n", result2string(result), desc);
     }
     virtual void onEnd(Test*) {
         if (!this->getCurrSuccess()) {
             SkDebugf("---- FAILED\n");
         }
     }
 private:
     int fIndex, fTotal;
     bool fAllowExtendedTest;
+    bool fAllowThreaded;
 };
 
 static const char* make_canonical_dir_path(const char* path, SkString* storage) {
     if (path) {
         // clean it up so it always has a trailing searator
         size_t len = strlen(path);
         if (0 == len) {
             path = NULL;
         } else if (SkPATH_SEPARATOR != path[len - 1]) {
             // resize to len + 1, to make room for searator
@@ skipping 14 matching lines @@
 static SkString gResourcePath;
 
 const SkString& Test::GetResourcePath() {
     return gResourcePath;
 }
 
 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.");
+DEFINE_bool2(threaded, z, false, "allow tests to use multiple threads.");
 DEFINE_bool2(verbose, v, false, "enable verbose output.");
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
     SkCommandLineFlags::SetUsage("");
     SkCommandLineFlags::Parse(argc, argv);
 
     if (!FLAGS_tmpDir.isEmpty()) {
         make_canonical_dir_path(FLAGS_tmpDir[0], &gTmpDir);
     }
@@ skipping 24 matching lines @@
         header.append(" SK_RELEASE");
 #endif
 #ifdef SK_SCALAR_IS_FIXED
         header.append(" SK_SCALAR_IS_FIXED");
 #else
         header.append(" SK_SCALAR_IS_FLOAT");
 #endif
         SkDebugf("%s\n", header.c_str());
     }
 
-    DebugfReporter reporter(FLAGS_extendedTest);
+    DebugfReporter reporter(FLAGS_extendedTest, FLAGS_threaded);
     Iter iter(&reporter);
     Test* test;
 
     const int count = Iter::Count();
     int index = 0;
     int failCount = 0;
     int skipCount = 0;
     while ((test = iter.next()) != NULL) {
         reporter.setIndexOfTotal(index, count);
         if (!FLAGS_match.isEmpty() && !strstr(test->getName(), FLAGS_match[0])) {
@@ skipping 27 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