Stop running SKPs in DM on the bots.

tools/dm_flags.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 50 matching lines @@
   # NP is running out of RAM when we run all these modes.  skia:3255
   if 'NexusPlayer' not in bot:
     configs.extend(mode + '-8888' for mode in
                    ['serialize', 'tiles_rt', 'pipe'])
 
   if 'ANGLE' in bot:
     configs.append('angle')
   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'))
 
   blacklist = []
   # This image is too large to be a texture for many GPUs.
   blacklist.extend('gpu _ _ PANO_20121023_214540.jpg'.split(' '))
   blacklist.extend('msaa _ _ PANO_20121023_214540.jpg'.split(' '))
 
   # Several of the newest version bmps fail on SkImageDecoder
   blacklist.extend('_ image decode pal8os2v2.bmp'.split(' '))
@@ skipping 29 matching lines @@
   if 'Win' in bot:
     blacklist.extend('_ image decode _'.split(' '))
     blacklist.extend('_ image subset _'.split(' '))
 
   # Certain gm's on win7 gpu and pdf are never finishing and keeping the test
   # running forever
   if 'Win7' in 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(' '))
     # These take 18+ hours to run.
     blacklist.extend('pdf gm _ fontmgr_iter'.split(' '))
     blacklist.extend('pdf _ _ PANO_20121023_214540.jpg'.split(' '))
     blacklist.extend('pdf skp _ worldjournal'.split(' '))
     blacklist.extend('pdf skp _ desk_baidu.skp'.split(' '))
     blacklist.extend('pdf skp _ desk_wikipedia.skp'.split(' '))
 
@@ skipping 73 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_args(sys.argv[2]), out)