fix --threads 4, blacklist interlaced1,2,3 on GPU

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 14 matching lines @@
   return inspect.getframeinfo(caller[0]).lineno
 
 
 cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
   # 32-bit desktop bots tend to run out of memory, because they have relatively
   # far more cores than RAM (e.g. 32 cores, 3G RAM).  Hold them back a bit.
   if '-x86-' in bot and not 'NexusPlayer' in bot:
-    args.append('--threads 4')
+    args.extend('--threads 4'.split(' '))
 
   configs = ['565', '8888', 'gpu']
 
   if '-GCE-' in bot:
     configs.extend(['f16', 'srgb'])              # Gamma-correct formats.
     configs.extend(['sp-8888', '2ndpic-8888'])   # Test niche uses of SkPicture.
 
   if '-TSAN' not in bot:
     if ('TegraK1'  in bot or
         'GTX550Ti' in bot or
@@ skipping 134 matching lines @@
     blacklist.extend([       'sp-8888', 'gm', '_', test])
     blacklist.extend([      'pic-8888', 'gm', '_', test])
     blacklist.extend([   '2ndpic-8888', 'gm', '_', test])
     blacklist.extend(['serialize-8888', 'gm', '_', test])
 
   # Extensions for RAW images
   r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
        "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]
 
   # skbug.com/4888
-  # Blacklist RAW images on GPU tests until we can resolve failures
+  # Blacklist RAW images (and a few large PNGs) on GPU bots
+  # until we can resolve failures
   if 'GPU' in bot:
+    blacklist.extend('_ image _ interlaced1.png'.split(' '))
+    blacklist.extend('_ image _ interlaced2.png'.split(' '))
+    blacklist.extend('_ image _ interlaced3.png'.split(' '))
     for raw_ext in r:
       blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
 
   match = []
   if 'Valgrind' in bot: # skia:3021
     match.append('~Threaded')
 
   if 'GalaxyS3' in bot:  # skia:1699
     match.append('~WritePixels')
 
@@ 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)