Revert of Blacklist HTC.dng on 32-bit Win CPU 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 140 matching lines @@
     blacklist.extend('_ image gen_platf rle4-height-negative.bmp'.split(' '))
     blacklist.extend('_ image gen_platf pal8os2v2.bmp'.split(' '))
     blacklist.extend('_ image gen_platf pal8os2v2-16.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rgba32abf.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rgb24prof.bmp'.split(' '))
     blacklist.extend('_ image gen_platf rgb24lprof.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 8bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 4bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 32bpp-pixeldata-cropped.bmp'.split(' '))
     blacklist.extend('_ image gen_platf 24bpp-pixeldata-cropped.bmp'.split(' '))
-    if 'CPU' in bot:
-      if 'x86_64' in bot:
-        # This GM triggers a SkSmallAllocator assert. skia:5315
-        blacklist.extend('_ gm _ composeshader_bitmap'.split(' '))
-      elif '-x86-' in bot:
-        # This image flakily fails to decode due to memory usage. skia:5318
-        blacklist.extend('_ image _ HTC.dng'.split(' '))
+    if 'x86_64' in bot and 'CPU' in bot:
+      # This GM triggers a SkSmallAllocator assert.
+      blacklist.extend('_ gm _ composeshader_bitmap'.split(' '))
 
   # skia:4095
   for test in ['not_native32_bitmap_config',
                'bleed_image',
                'bleed_alpha_image',
                'bleed_alpha_image_shader',
                'c_gms',
                'colortype',
                'colortype_xfermodes',
                'drawfilter',
@@ skipping 96 matching lines @@
     'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug',
     'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
     'Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Release',
     'Test-Mac-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
     'Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer',
     'Test-Mac10.8-Clang-MacMini4.1-CPU-SSE4-x86_64-Release',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-MSAN',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
     'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',
     'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
-    'Test-Win-MSVC-GCE-CPU-AVX2-x86-Release',
     'Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
     'Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan',
     'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
   ]
 
   cov = coverage.coverage()
   cov.start()
   for case in cases:
     args[case] = get_args(case)
   cov.stop()
@@ skipping 14 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)