diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-25 19:32:15 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-25 19:32:15 +0000 |
| commit | 6bd250a2a340348434b7b16bd4e4b5da0f598e3e (patch) | |
| tree | 34bbd0434468296dfc15e31cb2270a1b0a7f4a9e /tests/Test.cpp | |
| parent | 036405d4fb45b7549c820dc158faf35ef7c26b09 (diff) | |
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:
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@13586 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/Test.cpp')
| -rw-r--r-- | tests/Test.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/tests/Test.cpp b/tests/Test.cpp index daa23b132c..95b2f91c0c 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 @@ void Test::run() { } -/////////////////////////////////////////////////////////////////////////////// +SkString Test::GetTmpDir() { + const char* tmpDir = FLAGS_tmpDir.isEmpty() ? NULL : FLAGS_tmpDir[0]; + return SkString(tmpDir); +} -#if SK_SUPPORT_GPU -#include "GrContextFactory.h" -GrContextFactory gGrContextFactory; -#endif +static const char* gResourcePath = NULL; +void Test::SetResourcePath(const char* resourcePath) { gResourcePath = resourcePath; } -GrContextFactory* GpuTest::GetGrContextFactory() { -#if SK_SUPPORT_GPU - return &gGrContextFactory; -#else - return NULL; -#endif +SkString Test::GetResourcePath() { + return SkString(gResourcePath); } -void GpuTest::DestroyContexts() { -#if SK_SUPPORT_GPU - gGrContextFactory.destroyContexts(); -#endif -} |