aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dm_flags.py
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-03-22 12:36:01 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-03-22 12:36:01 -0700
commitbee39c5fbe22704825a2462552f81c0630735ff3 (patch)
tree787e05edd58e93b254aef9574d87dd801d623dbe /tools/dm_flags.py
parent4413e662a376e8689eb0ba0b4f84496b58d44d99 (diff)
fix --threads 4, blacklist interlaced1,2,3 on GPU
Diffstat (limited to 'tools/dm_flags.py')
-rwxr-xr-xtools/dm_flags.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 1d9034b540..0509eb5d72 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -32,7 +32,7 @@ def get_args(bot):
# 32-bit desktop bots tend to run out of memory, because they have relatively
# far more cores than RAM (e.g. 32 cores, 3G RAM). Hold them back a bit.
if '-x86-' in bot and not 'NexusPlayer' in bot:
- args.append('--threads 4')
+ args.extend('--threads 4'.split(' '))
configs = ['565', '8888', 'gpu']
@@ -187,8 +187,12 @@ def get_args(bot):
"ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]
# skbug.com/4888
- # Blacklist RAW images on GPU tests until we can resolve failures
+ # Blacklist RAW images (and a few large PNGs) on GPU bots
+ # until we can resolve failures
if 'GPU' in bot:
+ blacklist.extend('_ image _ interlaced1.png'.split(' '))
+ blacklist.extend('_ image _ interlaced2.png'.split(' '))
+ blacklist.extend('_ image _ interlaced3.png'.split(' '))
for raw_ext in r:
blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))