add extended option to Test

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 "SkGraphics.h"
 #include "Test.h"
 #include "SkOSFile.h"
@@ skipping 43 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() : fIndex(0), fTotal(0) {}
+    DebugfReporter(bool allowExtendedTest)
+        : fIndex(0)
+        , fTotal(0)
+        , fAllowExtendedTest(allowExtendedTest) {
+    }
 
     void setIndexOfTotal(int index, int total) {
         fIndex = index;
         fTotal = total;
     }
+
+    virtual bool allowExtendedTest() const {
+        return fAllowExtendedTest; 
+    }
+
 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;
 };
 
 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 15 matching lines @@
 
 const SkString& Test::GetResourcePath() {
     return gResourcePath;
 }
 
 int tool_main(int argc, char** argv);
 int tool_main(int argc, char** argv) {
 #if SK_ENABLE_INST_COUNT
     gPrintInstCount = true;
 #endif
+    bool allowExtendedTest = false;
+    bool verboseOutput = false;
+
     SkGraphics::Init();
 
     const char* matchStr = NULL;
 
     char* const* stop = argv + argc;
     for (++argv; argv < stop; ++argv) {
-        if (strcmp(*argv, "--match") == 0) {
+        if (0 == strcmp(*argv, "--match") || 0 == strcmp(*argv, "-m")) {
             ++argv;
             if (argv < stop && **argv) {
                 matchStr = *argv;
             } else {
                 SkDebugf("no following argument to --match\n");
                 return -1;
             }
-        } else if (0 == strcmp(*argv, "--tmpDir")) {
+        } else if (0 == strcmp(*argv, "--tmpDir") || 0 == strcmp(*argv, "-t")) {
             ++argv;
             if (argv < stop && **argv) {
                 make_canonical_dir_path(*argv, &gTmpDir);
             } else {
                 SkDebugf("no following argument to --tmpDir\n");
                 return -1;
             }
-        } else if ((0 == strcmp(*argv, "--resourcePath")) ||
-                   (0 == strcmp(*argv, "-i"))) {
+        } else if (0 == strcmp(*argv, "--resourcePath") || 0 == strcmp(*argv, "-i")) {
             argv++;
             if (argv < stop && **argv) {
                 make_canonical_dir_path(*argv, &gResourcePath);
             }
+        } else if (0 == strcmp(*argv, "--extendedTest") || 0 == strcmp(*argv, "-x")) {
+            allowExtendedTest = true;
+        } else if (0 == strcmp(*argv, "--verbose") || 0 == strcmp(*argv, "-v")) {
+            verboseOutput = true;
+        } else {
+            if (0 != strcmp(*argv, "--help") && 0 != strcmp(*argv, "-h")
+                    && 0 != strcmp(*argv, "-?")) {
+                SkDebugf("Unknown option %s. ", *argv);
+            }
+            SkDebugf("Skia UnitTests options are:\n");
+            SkDebugf("  -m --match [test-name-substring]\n");
+            SkDebugf("  -t --tmpDir [dir]\n");
+            SkDebugf("  -i --resourcePath [dir]\n");
+            SkDebugf("  -x --extendedTest\n");
+            SkDebugf("  -v --verbose\n");
+            return 1;
         }
     }
 
     {
         SkString header("Skia UnitTests:");
         if (matchStr) {
             header.appendf(" --match %s", matchStr);
         }
         if (!gTmpDir.isEmpty()) {
             header.appendf(" --tmpDir %s", gTmpDir.c_str());
         }
         if (!gResourcePath.isEmpty()) {
             header.appendf(" --resourcePath %s", gResourcePath.c_str());
         }
 #ifdef SK_DEBUG
         header.append(" SK_DEBUG");
 #else
         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;
+    DebugfReporter reporter(allowExtendedTest);
     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 (NULL != matchStr && !strstr(test->getName(), matchStr)) {
             ++skipCount;
         } else {
             if (!test->run()) {
                 ++failCount;
             }
         }
         SkDELETE(test);
         index += 1;
     }
 
     SkDebugf("Finished %d tests, %d failures, %d skipped.\n",
              count, failCount, skipCount);
-
+    int testCount = reporter.countTests();
+    if (verboseOutput && testCount > 0) {
+        SkDebugf("Ran %d Internal tests.\n", testCount);
+    }
 #if SK_SUPPORT_GPU
 
 #if GR_CACHE_STATS
     GrContext *gr = GpuTest::GetContext();
 
     gr->printCacheStats();
 #endif
 
 #endif
 
     SkGraphics::Term();
     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