aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp/dm.gyp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-25 19:32:15 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2014-02-25 19:32:15 +0000
commit6bd250a2a340348434b7b16bd4e4b5da0f598e3e (patch)
tree34bbd0434468296dfc15e31cb2270a1b0a7f4a9e /gyp/dm.gyp
parent036405d4fb45b7549c820dc158faf35ef7c26b09 (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 'gyp/dm.gyp')
-rw-r--r--gyp/dm.gyp8
1 files changed, 7 insertions, 1 deletions
diff --git a/gyp/dm.gyp b/gyp/dm.gyp
index 3cc51a09ba..55f5f9bd14 100644
--- a/gyp/dm.gyp
+++ b/gyp/dm.gyp
@@ -9,6 +9,7 @@
'include_dirs': [
'../dm',
'../gm',
+ '../tests',
'../src/images',
'../src/lazy',
'../src/core',
@@ -18,7 +19,11 @@
'../src/utils/debugger',
'../tools',
],
- 'includes': [ 'gmslides.gypi' ],
+ 'includes': [
+ 'gmslides.gypi',
+ 'pathops_unittest.gypi',
+ 'tests.gypi',
+ ],
'sources': [
'../dm/DM.cpp',
'../dm/DMCpuTask.cpp',
@@ -30,6 +35,7 @@
'../dm/DMSerializeTask.cpp',
'../dm/DMTask.cpp',
'../dm/DMTaskRunner.cpp',
+ '../dm/DMTestTask.cpp',
'../dm/DMTileGridTask.cpp',
'../dm/DMUtil.cpp',
'../dm/DMWriteTask.cpp',