Disable testcase7.bmp on SkImageDecoder and clean up dm_flags

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 88 matching lines @@
   blacklist.extend('_ image decode rgba32abf.bmp'.split(' '))
   blacklist.extend('_ image decode rgb24largepal.bmp'.split(' '))
   blacklist.extend('_ image decode pal8os2v2-16.bmp'.split(' '))
   blacklist.extend('_ image decode pal8oversizepal.bmp'.split(' '))
   blacklist.extend('_ image decode pal4rletrns.bmp'.split(' '))
   blacklist.extend('_ image decode pal8rletrns.bmp'.split(' '))
   blacklist.extend('_ image decode 4bpp-pixeldata-cropped.bmp'.split(' '))
   blacklist.extend('_ image decode 8bpp-pixeldata-cropped.bmp'.split(' '))
   blacklist.extend('_ image decode 24bpp-pixeldata-cropped.bmp'.split(' '))
   blacklist.extend('_ image decode 32bpp-pixeldata-cropped.bmp'.split(' '))
-  blacklist.extend('_ image subset rgb24largepal.bmp'.split(' '))
-  blacklist.extend('_ image subset pal8os2v2-16.bmp'.split(' '))
-  blacklist.extend('_ image subset pal8oversizepal.bmp'.split(' '))
-  blacklist.extend('_ image subset 4bpp-pixeldata-cropped.bmp'.split(' '))
-  blacklist.extend('_ image subset 8bpp-pixeldata-cropped.bmp'.split(' '))
-  blacklist.extend('_ image subset 24bpp-pixeldata-cropped.bmp'.split(' '))
-  blacklist.extend('_ image subset 32bpp-pixeldata-cropped.bmp'.split(' '))
+  blacklist.extend('_ image decode testcase7.bmp'.split(' '))
 
   # New ico files that fail on SkImageDecoder
   blacklist.extend('_ image decode Hopstarter-Mac-Folders-Apple.ico'.split(' '))
 
   # Incomplete image tests that fail on SkImageDecoder
   blacklist.extend('_ image decode inc0.gif'.split(' '))
   blacklist.extend('_ image decode inc1.gif'.split(' '))
   blacklist.extend('_ image decode incInterlaced.gif'.split(' '))
   blacklist.extend('_ image decode inc0.jpg'.split(' '))
   blacklist.extend('_ image decode incGray.jpg'.split(' '))
   blacklist.extend('_ image decode inc0.wbmp'.split(' '))
   blacklist.extend('_ image decode inc1.wbmp'.split(' '))
   blacklist.extend('_ image decode inc0.webp'.split(' '))
   blacklist.extend('_ image decode inc1.webp'.split(' '))
   blacklist.extend('_ image decode inc0.ico'.split(' '))
   blacklist.extend('_ image decode inc1.ico'.split(' '))
   blacklist.extend('_ image decode inc0.png'.split(' '))
   blacklist.extend('_ image decode inc1.png'.split(' '))
   blacklist.extend('_ image decode inc2.png'.split(' '))
   blacklist.extend('_ image decode inc12.png'.split(' '))
   blacklist.extend('_ image decode inc13.png'.split(' '))
   blacklist.extend('_ image decode inc14.png'.split(' '))
-  blacklist.extend('_ image subset inc0.webp'.split(' '))
-  blacklist.extend('_ image subset inc1.webp'.split(' '))
 
   # Leon doesn't care about this, so why run it?
   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(' '))
 
   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(' '))
 
   if 'iOS' in bot:
     blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
     blacklist.extend('gpu image decode _ msaa image decode _'.split(' '))
-    blacklist.extend('gpu image subset _ msaa image subset _'.split(' '))
     blacklist.extend('msaa16 gm _ tilemodesProcess'.split(' '))
 
   # the 32-bit GCE bots run out of memory in DM when running these large images
   if 'x86' in bot and not 'x86-64' in bot:
     blacklist.extend('_ image _ interlaced1.png'.split(' '))
     blacklist.extend('_ image _ interlaced2.png'.split(' '))
     blacklist.extend('_ image _ interlaced3.png'.split(' '))
 
   if blacklist:
     args.append('--blacklist')
@@ skipping 72 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)