Revert of Blacklist HTC.dng on 32-bit Win CPU bots (patchset #1 id:1 of https://codereview.chromium.org/1995703002/ )

Reason for revert:
We think we have independently fixed this problem by using a smaller image for HTC.dng

Original issue's description:
> Blacklist HTC.dng on 32-bit Win CPU bots
>
> BUG=skia:5318
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1995703002
>
> Committed: https://skia.googlesource.com/skia/+/62efdbde9987df3422f677a1a7c8f355791c1ae4

TBR=msarett@google.com,borenet@google.com,borenet@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=skia:5318

Review-Url: https://codereview.chromium.org/2004203002
This commit is contained in:
scroggo 2016-05-23 14:35:52 -07:00 committed by Commit bot
parent 3d5942e8a4
commit 23b80c402a
2 changed files with 3 additions and 215 deletions

View File

@ -3326,213 +3326,6 @@
"--match",
"~Threaded"
],
"Test-Win-MSVC-GCE-CPU-AVX2-x86-Release": [
"--threads",
"4",
"--config",
"565",
"8888",
"gpu",
"gpusrgb",
"pdf",
"msaa16",
"f16",
"srgb",
"sp-8888",
"2ndpic-8888",
"serialize-8888",
"tiles_rt-8888",
"pic-8888",
"--src",
"tests",
"gm",
"image",
"--blacklist",
"f16",
"_",
"_",
"dstreadshuffle",
"f16",
"image",
"_",
"_",
"srgb",
"image",
"_",
"_",
"gpusrgb",
"image",
"_",
"_",
"_",
"image",
"gen_platf",
"rle8-height-negative.bmp",
"_",
"image",
"gen_platf",
"rle4-height-negative.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2.bmp",
"_",
"image",
"gen_platf",
"pal8os2v2-16.bmp",
"_",
"image",
"gen_platf",
"rgba32abf.bmp",
"_",
"image",
"gen_platf",
"rgb24prof.bmp",
"_",
"image",
"gen_platf",
"rgb24lprof.bmp",
"_",
"image",
"gen_platf",
"8bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"4bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"32bpp-pixeldata-cropped.bmp",
"_",
"image",
"gen_platf",
"24bpp-pixeldata-cropped.bmp",
"_",
"image",
"_",
"HTC.dng",
"serialize-8888",
"gm",
"_",
"not_native32_bitmap_config",
"serialize-8888",
"gm",
"_",
"bleed_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image",
"serialize-8888",
"gm",
"_",
"bleed_alpha_image_shader",
"serialize-8888",
"gm",
"_",
"c_gms",
"serialize-8888",
"gm",
"_",
"colortype",
"serialize-8888",
"gm",
"_",
"colortype_xfermodes",
"serialize-8888",
"gm",
"_",
"drawfilter",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_0.75_0",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds_1_-0.25",
"serialize-8888",
"gm",
"_",
"fontmgr_bounds",
"serialize-8888",
"gm",
"_",
"fontmgr_match",
"serialize-8888",
"gm",
"_",
"fontmgr_iter",
"serialize-8888",
"gm",
"_",
"verylargebitmap",
"serialize-8888",
"gm",
"_",
"verylarge_picture_image",
"sp-8888",
"gm",
"_",
"drawfilter",
"pic-8888",
"gm",
"_",
"drawfilter",
"2ndpic-8888",
"gm",
"_",
"drawfilter",
"sp-8888",
"gm",
"_",
"image-cacherator-from-picture",
"pic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-picture",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-picture",
"sp-8888",
"gm",
"_",
"image-cacherator-from-raster",
"pic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-raster",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-raster",
"sp-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"pic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"2ndpic-8888",
"gm",
"_",
"image-cacherator-from-ctable",
"serialize-8888",
"gm",
"_",
"image-cacherator-from-ctable"
],
"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug": [
"--config",
"565",

View File

@ -158,13 +158,9 @@ def get_args(bot):
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',
@ -281,7 +277,6 @@ def self_test():
'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',