Let DM run unit tests.

tests/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 "Test.h"
 
+#include "SkCommandLineFlags.h"
 #include "SkError.h"
 #include "SkString.h"
 #include "SkTArray.h"
+#include "SkTLS.h"
 #include "SkTime.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #include "gl/SkNativeGLContext.h"
 #else
 class GrContext;
 #endif
 
+DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
+DEFINE_string2(resourcePath, i, "resources", "directory for test resources.");

[bsalomon, 2014/02/24 20:23:14]

Does this mean the same flag is used for test and gm resources? Do we actually
use the same dir to hold them today?

[mtklein, 2014/02/24 20:36:12]

Sort of.  Right now one is --resources and the other is --resourcePath.  They
both default to "resources", which is where we store all resources for both GMs
and tests.

Let me see if I can merge these two flags cleanly.

+
 using namespace skiatest;
 
 Reporter::Reporter() : fTestCount(0) {
 }
 
 void Reporter::startTest(Test* test) {
     this->bumpTestCount();
     this->onStart(test);
 }
 
@@ skipping 75 matching lines @@
     fElapsed = SkTime::GetMSecs() - start;
 
     // Now tell fReporter about any failures and wrap up.
     for (int i = 0; i < local.numFailures(); i++) {
       fReporter->reportFailed(local.failure(i));
     }
     fReporter->endTest(this);
 
 }
 
+SkString Test::GetTmpDir() {
+    const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
+    return SkString(tmpDir);
+}
+
+SkString Test::GetResourcePath() {
+    const char* resourcePath = FLAGS_resourcePath.isEmpty() ? NULL : FLAGS_resourcePath[0];
+    return SkString(resourcePath);
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////
 
 #if SK_SUPPORT_GPU
-#include "GrContextFactory.h"
-GrContextFactory gGrContextFactory;
-#endif
+#  include "GrContextFactory.h"
 
-GrContextFactory* GpuTest::GetGrContextFactory() {
-#if SK_SUPPORT_GPU
-    return &gGrContextFactory;
-#else
-    return NULL;
-#endif
+static void* new_gr_context_factory() {
+    return SkNEW(GrContextFactory);
 }
 
-void GpuTest::DestroyContexts() {
-#if SK_SUPPORT_GPU
-    gGrContextFactory.destroyContexts();
+static void delete_gr_context_factory(void* factory) {
+    SkDELETE((GrContextFactory*) factory);
+}
+GrContextFactory* GpuTest::GetGrContextFactory() {
+    return reinterpret_cast<GrContextFactory*>(SkTLS::Get(&new_gr_context_factory,
+                                                          &delete_gr_context_factory));
+}
+#else  // SK_GPU_SUPPORT
+GrContextFactory* GpuTest::GetGrContextFactory() { return NULL; }
 #endif
-}