Disable questionable bmps on Mac platform decoder
These are already disabled on WIC, but they are supported by SkCodec.
Bug: skia:6984
Change-Id: Ib248749f357debcc173dfaa2bcd5adc8da52df22
Reviewed-on: https://skia-review.googlesource.com/36440
Commit-Queue: Leon Scroggins <scroggo@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
index ac7f2a0..6a0a8d7 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
@@ -363,6 +363,14 @@
"image",
"gen_platf",
"testimgari.jpg",
+ "_",
+ "image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
index 4d5f831..83e7711 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
@@ -362,6 +362,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
index 1aca345..f88cde6 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json
@@ -267,14 +267,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -314,6 +306,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
index 783f2ba..8231774 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json
@@ -273,14 +273,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -320,6 +312,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
index c8ee7f6..dab1d9a 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json
@@ -270,14 +270,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -317,6 +309,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
index 6c2c8d2..fa59c8e 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json
@@ -267,14 +267,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -314,6 +306,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
index c8f9e3e..7667b04 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json
@@ -267,14 +267,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -314,6 +306,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
index 94a70b5..ef69bc9 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json
@@ -272,14 +272,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -319,6 +311,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
index b390846..beae093 100644
--- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
+++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json
@@ -267,14 +267,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -314,6 +306,14 @@
"testimgari.jpg",
"_",
"image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
+ "_",
+ "image",
"_",
"interlaced1.png",
"_",
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 815652b..1c6f914 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
@@ -272,14 +272,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -317,6 +309,14 @@
"image",
"gen_platf",
"testimgari.jpg",
+ "_",
+ "image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json
index e5da715..1fafa3c 100644
--- a/infra/bots/recipes/test.expected/trybot.json
+++ b/infra/bots/recipes/test.expected/trybot.json
@@ -294,14 +294,6 @@
"_",
"image",
"gen_platf",
- "rle8-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
- "rle4-height-negative.bmp",
- "_",
- "image",
- "gen_platf",
"pal8os2v2.bmp",
"_",
"image",
@@ -343,6 +335,14 @@
"image",
"gen_platf",
"testimgari.jpg",
+ "_",
+ "image",
+ "gen_platf",
+ "rle8-height-negative.bmp",
+ "_",
+ "image",
+ "gen_platf",
+ "rle4-height-negative.bmp",
"serialize-8888",
"gm",
"_",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 1360677..233bb08 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -287,8 +287,6 @@
# 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')
blacklist('_ image gen_platf pal8os2v2.bmp')
blacklist('_ image gen_platf pal8os2v2-16.bmp')
blacklist('_ image gen_platf rgba32abf.bmp')
@@ -302,9 +300,12 @@
# 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:
+ # WIC and CG fail on arithmetic jpegs
blacklist('_ image gen_platf testimgari.jpg')
+ # More questionable bmps that fail on Mac, too. skbug.com/6984
+ blacklist('_ image gen_platf rle8-height-negative.bmp')
+ blacklist('_ image gen_platf rle4-height-negative.bmp')
if 'Android' in bot or 'iOS' in bot:
# This test crashes the N9 (perhaps because of large malloc/frees). It also
