diff options
| author |  Matt Sarett <msarett@google.com> | 2017-05-01 09:13:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-01 16:19:50 +0000 |
| commit | 6c50a2e9ba817a460687accffeab4044dfcf5775 (patch) | |
| tree | 4d73af3f76ec522bfb2127f9a6e4367a43703ecb | |
| parent | 25b37430e606ff268d000b8d1d2c59b4c90679ed (diff) | |
Blacklist testimgari.jpg on CG
Bug: skia:
Change-Id: I2c471d18f29bb6d0e8ac4a4d0afa1815788bb121
Reviewed-on: https://skia-review.googlesource.com/14825
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Matt Sarett <msarett@google.com>
4 files changed, 17 insertions, 6 deletions
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 0cc1d9c465..7a9d63006c 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -367,6 +367,10 @@ "image", "gen_platf", "inc14.png", + "_", + "image", + "gen_platf", + "testimgari.jpg", "serialize-8888", "gm", "_", diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json index edce957149..3066a8a377 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer.json @@ -352,6 +352,10 @@ "inc14.png", "_", "image", + "gen_platf", + "testimgari.jpg", + "_", + "image", "_", "interlaced1.png", "_", diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index 4e105fcc32..54fc88b4d3 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -342,13 +342,13 @@ "gen_platf", "24bpp-pixeldata-cropped.bmp", "_", - "image", - "gen_platf", - "testimgari.jpg", - "_", "gm", "_", "composeshader_bitmap", + "_", + "image", + "gen_platf", + "testimgari.jpg", "serialize-8888", "gm", "_", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 97ec7b9959..4ff50c0fad 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -218,7 +218,7 @@ def dm_flags(bot): blacklist('_ image gen_platf inc13.png') blacklist('_ image gen_platf inc14.png') - # WIC fails on questionable bmps and arithmetic jpegs + # WIC fails on questionable bmps if 'Win' in bot: blacklist('_ image gen_platf rle8-height-negative.bmp') blacklist('_ image gen_platf rle4-height-negative.bmp') @@ -231,11 +231,14 @@ def dm_flags(bot): blacklist('_ image gen_platf 4bpp-pixeldata-cropped.bmp') blacklist('_ image gen_platf 32bpp-pixeldata-cropped.bmp') blacklist('_ image gen_platf 24bpp-pixeldata-cropped.bmp') - blacklist('_ image gen_platf testimgari.jpg') if 'x86_64' in bot and 'CPU' in bot: # This GM triggers a SkSmallAllocator assert. blacklist('_ gm _ composeshader_bitmap') + # WIC and CG fail on arithmetic jpegs + if 'Win' in bot or 'Mac' in bot: + blacklist('_ image gen_platf testimgari.jpg') + if 'Android' in bot or 'iOS' in bot: # This test crashes the N9 (perhaps because of large malloc/frees). It also # is fairly slow and not platform-specific. So we just disable it on all of |