aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Matt Sarett <msarett@google.com>2017-05-22 13:45:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-22 18:14:22 +0000
commit112565e3e7e0403a2a1bf1db9a42134a5cd6ed85 (patch)
tree07e6a003c6c8374232f34013f3bac458475a3c28 /infra
parent4d1c5d676eb32ed304ee4aa410cebbc6467b59c2 (diff)
Blacklist memory instensive tests on 32-bit bots (part 2)
Bug: skia: Change-Id: Id517d4ba3b0f728e13f160e0766b6fb822a682f9 Reviewed-on: https://skia-review.googlesource.com/17482 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Matt Sarett <msarett@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json4
-rw-r--r--infra/bots/recipes/test.py1
2 files changed, 5 insertions, 0 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
index 0f5de1bd94..72c5ea62fc 100644
--- a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json
@@ -526,6 +526,10 @@
"_",
"image",
"_",
+ "abnormal.wbmp",
+ "_",
+ "image",
+ "_",
"interlaced1.png",
"_",
"image",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 2bd859e0b2..646f0ef71a 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -348,6 +348,7 @@ def dm_flags(bot):
# Blacklist memory intensive tests on 32-bit bots.
if ('Win2k8' in bot or 'Win8' in bot) and 'x86-' in bot:
blacklist('_ image f16 _')
+ blacklist('_ image _ abnormal.wbmp')
blacklist('_ image _ interlaced1.png')
blacklist('_ image _ interlaced2.png')
blacklist('_ image _ interlaced3.png')