Let DM run unit tests.
- refactor GYPs and a few flags
- make GPU tests grab a thread-local GrContextFactory when needed as we do in DM for GMs
- add a few more UI features to make DM more like tests
I believe this makes the program 'tests' obsolete.
It should be somewhat faster to run the two sets together than running the old binaries serially:
- serial: tests 20s (3m18s CPU), dm 21s (3m01s CPU)
- together: 27s (6m21s CPU)
Next up is to incorporate benches. I'm only planning there on a single-pass sanity check, so that won't obsolete the program 'bench' just yet.
Tested: out/Debug/tests && out/Debug/dm && echo ok
BUG=skia:
Committed: http://code.google.com/p/skia/source/detail?r=13586
R=reed@google.com, bsalomon@google.com, mtklein@google.com, tfarina@chromium.org
Author: mtklein@chromium.org
Review URL: https://codereview.chromium.org/178273002
git-svn-id: http://skia.googlecode.com/svn/trunk@13592 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/tests/Test.cpp b/tests/Test.cpp
index daa23b1..95b2f91 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -7,6 +7,7 @@
*/
#include "Test.h"
+#include "SkCommandLineFlags.h"
#include "SkError.h"
#include "SkString.h"
#include "SkTArray.h"
@@ -19,6 +20,8 @@
class GrContext;
#endif
+DEFINE_string2(tmpDir, t, NULL, "tmp directory for tests to use.");
+
using namespace skiatest;
Reporter::Reporter() : fTestCount(0) {
@@ -114,23 +117,15 @@
}
-///////////////////////////////////////////////////////////////////////////////
-
-#if SK_SUPPORT_GPU
-#include "GrContextFactory.h"
-GrContextFactory gGrContextFactory;
-#endif
-
-GrContextFactory* GpuTest::GetGrContextFactory() {
-#if SK_SUPPORT_GPU
- return &gGrContextFactory;
-#else
- return NULL;
-#endif
+SkString Test::GetTmpDir() {
+ const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0];
+ return SkString(tmpDir);
}
-void GpuTest::DestroyContexts() {
-#if SK_SUPPORT_GPU
- gGrContextFactory.destroyContexts();
-#endif
+static const char* gResourcePath = NULL;
+void Test::SetResourcePath(const char* resourcePath) { gResourcePath = resourcePath; }
+
+SkString Test::GetResourcePath() {
+ return SkString(gResourcePath);
}
+