Add --resourcePath flag to the test program.

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 81 matching lines @@
         } else if (SkPATH_SEPARATOR != path[len - 1]) {
             // resize to len + 1, to make room for searator
             storage->set(path, len + 1);
             storage->writable_str()[len] = SkPATH_SEPARATOR;
             path = storage->c_str();
         }
     }
     return path;
 }
 
-static const char* gTmpDir;
+static SkString gTmpDir;
 
-const char* Test::GetTmpDir() {
+const SkString& Test::GetTmpDir() {
     return gTmpDir;
 }
 
+static SkString gResourcePath;
+
+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
     SkGraphics::Init();
 
     const char* matchStr = NULL;
 
     char* const* stop = argv + argc;
     for (++argv; argv < stop; ++argv) {
         if (strcmp(*argv, "--match") == 0) {
             ++argv;
             if (argv < stop && **argv) {
                 matchStr = *argv;
             } else {
                 SkDebugf("no following argument to --match\n");
                 return -1;
             }
         } else if (0 == strcmp(*argv, "--tmpDir")) {
             ++argv;
             if (argv < stop && **argv) {
-                gTmpDir = *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"))) {
+            argv++;
+            if (argv < stop && **argv) {
+                make_canonical_dir_path(*argv, &gResourcePath);
+            }
         }
     }
 
-    SkString tmpDirStorage;
-    gTmpDir = make_canonical_dir_path(gTmpDir, &tmpDirStorage);
-
     {
         SkString header("Skia UnitTests:");
         if (matchStr) {
             header.appendf(" --match %s", matchStr);
         }
-        if (gTmpDir) {
-            header.appendf(" --tmpDir %s", gTmpDir);
+        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");
@@ skipping 39 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