When running under Valgrind, don't draw .webps into .pdfs.

This blacklist entry bans any test with 'pdf' config, any source type, whose
name has '.webp' in it.  In practice, that's 'image' or 'subset' source type
decoding some WEBP file.

BUG=skia:3505

Review URL: https://codereview.chromium.org/982163002
This commit is contained in:
mtklein 2015-03-05 13:38:17 -08:00 committed by Commit bot
parent 13e8e23967
commit 150d3503ed
2 changed files with 9 additions and 2 deletions

View File

@ -106,6 +106,7 @@
"gpu", "gpu",
"msaa16", "msaa16",
"nvprmsaa16", "nvprmsaa16",
"pdf",
"serialize-8888", "serialize-8888",
"tiles_rt-8888", "tiles_rt-8888",
"pipe-8888", "pipe-8888",
@ -117,6 +118,9 @@
"msaa", "msaa",
"_", "_",
"PANO_20121023_214540.jpg", "PANO_20121023_214540.jpg",
"pdf",
"_",
".webp",
"--match", "--match",
"~Threaded" "~Threaded"
], ],

View File

@ -32,8 +32,7 @@ def get_args(bot):
else: else:
configs.extend(['msaa16', 'nvprmsaa16']) configs.extend(['msaa16', 'nvprmsaa16'])
# Runs out of memory on Android bots and Daisy. Everyone else seems fine. # Runs out of memory on Android bots and Daisy. Everyone else seems fine.
# Valgrind: PDF + .webp -> jumps depending on uninitialized memory. skia:3505 if 'Android' not in bot and 'Daisy' not in bot:
if 'Android' not in bot and 'Daisy' not in bot and 'Valgrind' not in bot:
configs.append('pdf') configs.append('pdf')
# Xoom and NP are running out of RAM when we run all these modes. skia:3255 # Xoom and NP are running out of RAM when we run all these modes. skia:3255
@ -59,6 +58,10 @@ def get_args(bot):
blacklist.extend('gpu skp _ gpu image _ gpu subset _'.split(' ')) blacklist.extend('gpu skp _ gpu image _ gpu subset _'.split(' '))
blacklist.extend('msaa skp _ msaa image _ gpu subset _'.split(' ')) blacklist.extend('msaa skp _ msaa image _ gpu subset _'.split(' '))
# PDF + .webp -> jumps depending on uninitialized memory. skia:3505
if 'Valgrind' in bot:
blacklist.extend('pdf _ .webp'.split(' '))
if blacklist: if blacklist:
args.append('--blacklist') args.append('--blacklist')
args.extend(blacklist) args.extend(blacklist)