Index: tools/dm_flags.py |
diff --git a/tools/dm_flags.py b/tools/dm_flags.py |
index 663507ebb9c6b943208de35563bd50d772a96b39..a6b872f079fb41e6cdfe26c2092140c507cec6f4 100755 |
--- a/tools/dm_flags.py |
+++ b/tools/dm_flags.py |
@@ -155,13 +155,6 @@ def get_args(bot): |
blacklist.extend([ '2ndpic-8888', 'gm', '_', test]) |
blacklist.extend(['serialize-8888', 'gm', '_', test]) |
- # NexusPlayer runs out of memory running RAW codec tests |
- if 'NexusPlayer' in bot: |
- r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw", |
- "ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"] |
- for raw_ext in r: |
- blacklist.extend(('_ image _ .%s' % raw_ext).split(' ')) |
- |
match = [] |
if 'Valgrind' in bot: # skia:3021 |
match.append('~Threaded') |
@@ -199,6 +192,11 @@ def get_args(bot): |
args.append('--match') |
args.extend(match) |
+ # These bots run out of memory running RAW codec tests. Do not run them in |
+ # parallel |
+ if 'NexusPlayer' in bot or 'Nexus5' in bot or 'Nexus9' in bot: |
+ args.append('--noRAW_threading') |
+ |
return args |
cov_end = lineno() # Don't care about code coverage past here. |