Stop testing SkImageDecoder in DM/nanobench

tools/dm_flags.py

Index: tools/dm_flags.py
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index be348bc680c61d87bc1efc01ca50b57bd42ad059..fc7a46c675c6292d9bea8830c75c9b7003443b01 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -93,57 +93,6 @@ def get_args(bot):
 
   blacklist = []
 
-  # Several of the newest version bmps fail on SkImageDecoder
-  blacklist.extend('_ image decode pal8os2v2.bmp'.split(' '))
-  blacklist.extend('_ image decode pal8v4.bmp'.split(' '))
-  blacklist.extend('_ image decode pal8v5.bmp'.split(' '))
-  blacklist.extend('_ image decode rgb16-565.bmp'.split(' '))
-  blacklist.extend('_ image decode rgb16-565pal.bmp'.split(' '))
-  blacklist.extend('_ image decode rgb32-111110.bmp'.split(' '))
-  blacklist.extend('_ image decode rgb32bf.bmp'.split(' '))
-  blacklist.extend('_ image decode rgba32.bmp'.split(' '))
-  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 decode testcase7.bmp'.split(' '))
-
-  # New ico files that fail on SkImageDecoder
-  blacklist.extend('_ image decode Hopstarter-Mac-Folders-Apple.ico'.split(' '))
-
-  # Gif test image uses uninitialized memory on Mac bots
-  if 'Mac' in bot:
-    blacklist.extend('_ image decode frame_larger_than_image.gif'.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(' '))
-
-  # Leon doesn't care about this, so why run it?
-  if 'Win' in bot:
-    blacklist.extend('_ image decode _'.split(' '))
-
   # Certain gm's on win7 gpu and pdf are never finishing and keeping the test
   # running forever
   if 'Win7' in bot:
@@ -160,15 +109,8 @@ def get_args(bot):
 
   if 'iOS' in bot:
     blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' '))
-    blacklist.extend('gpu image decode _ msaa image decode _'.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:

[msarett, 2016/01/27 15:52:37]

There is still a risk of this bot running out of memory (these are disabled for
Codec too).  I'm fine if we want to see if removing ImageDecoder solves the
problem or if we want to leave these tests in the blacklist.

[scroggo, 2016/01/27 16:13:24]

Ah, my mistake. "image" used to mean "SkImageDecoder", while "codec" (I think?)
meant SkCodec. But I forgot that they changed. I'll leave this here. If we
decide to remove it, we can do so separately.

-    blacklist.extend('_ image _ interlaced1.png'.split(' '))
-    blacklist.extend('_ image _ interlaced2.png'.split(' '))
-    blacklist.extend('_ image _ interlaced3.png'.split(' '))
-
   # skia:4095
   for test in ['not_native32_bitmap_config',
                'bleed_image',