Stop running SKPs in DM on the bots.

We're not triaging them, and we get the same coverage (both Release and Debug)
from nanobench.

BUG=skia:

Review URL: https://codereview.chromium.org/1178943006

diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 1140410..915719b 100644 (file)
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -15,6 +15,10 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
+    "--src", 
+    "tests", 
+    "gm", 
+    "image", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -168,11 +172,11 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
-    "--threads", 
-    "0", 
     "--src", 
     "tests", 
     "gm", 
+    "--threads", 
+    "0", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -299,11 +303,11 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
-    "--threads", 
-    "0", 
     "--src", 
     "tests", 
     "gm", 
+    "--threads", 
+    "0", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -821,6 +825,10 @@
     "565", 
     "8888", 
     "gpu", 
+    "--src", 
+    "tests", 
+    "gm", 
+    "image", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -957,6 +965,10 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
+    "--src", 
+    "tests", 
+    "gm", 
+    "image", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -1091,6 +1103,10 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
+    "--src", 
+    "tests", 
+    "gm", 
+    "image", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -1249,6 +1265,9 @@
     "serialize-8888", 
     "tiles_rt-8888", 
     "pipe-8888", 
+    "--src", 
+    "tests", 
+    "gm", 
     "--blacklist", 
     "gpu", 
     "_", 
@@ -1407,6 +1426,9 @@
     "tiles_rt-8888", 
     "pipe-8888", 
     "angle", 
+    "--src", 
+    "tests", 
+    "gm", 
     "--blacklist", 
     "gpu", 
     "_", 

diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 9ab6fe9..3186245 100755 (executable)
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -68,6 +68,14 @@ def get_args(bot):
   args.append('--config')
   args.extend(configs)
 
+  # Run tests and gms everywhere,
+  # and image decoding tests everywhere except GPU bots.
+  # TODO: remove skp from default --src list?
+  if 'GPU' in bot:
+    args.extend('--src tests gm'.split(' '))
+  else:
+    args.extend('--src tests gm image'.split(' '))
+
   if 'GalaxyS' in bot:
     args.extend(('--threads', '0'))
 
@@ -117,13 +125,6 @@ def get_args(bot):
     blacklist.extend('msaa16 gm _ colorwheelnative'.split(' '))
     blacklist.extend('pdf gm _ fontmgr_iter_factory'.split(' '))
 
-  # Drawing SKPs or images into GPU canvases is a New Thing.
-  # We are running out of RAM on some Android bots, so we are restricting
-  # all GPU Android bots to only run tests and GMs.
-  if ('Android' in bot and
-      'GPU'     in bot):
-    args.extend('--src tests gm'.split(' '))
-
   if 'Valgrind' in bot:
     # PDF + .webp -> jumps depending on uninitialized memory.  skia:3505
     blacklist.extend('pdf _ _ .webp'.split(' '))