Update flags passed to Android GPU bots to exclude running skps and image sources.

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 100 matching lines @@
     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.
-  # It seems like we're running out of RAM on some Android bots, so start off
-  # with a very wide blacklist disabling all these tests on all Android bots.
-  if 'Android' in bot:  # skia:3255
-    blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
-    blacklist.extend('gpu image decode _ msaa image decode _'.split(' '))

[mtklein, 2015/06/10 15:56:19]

FWIW, msaa blacklisted both msaa4 and msaa16.  They match anywhere.

-    blacklist.extend('gpu image subset _ msaa image subset _'.split(' '))
+  # 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 74 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)