Disable incomplete image tests in nanobench
BUG=skia:
Review URL: https://codereview.chromium.org/1448893003
diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json
index 8164915..be957e5 100644
--- a/tools/nanobench_flags.json
+++ b/tools/nanobench_flags.json
@@ -18,7 +18,26 @@
"~desk_unicodetable",
"~interlaced1.png",
"~interlaced2.png",
- "~interlaced3.png"
+ "~interlaced3.png",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
],
"Perf-Android-Nexus7-Tegra3-Arm7-Release": [
"--scales",
@@ -36,7 +55,26 @@
"--match",
"~blurroundrect",
"~patch_grid",
- "~desk_carsvg"
+ "~desk_carsvg",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
],
"Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release": [
"--images",
@@ -54,7 +92,26 @@
"~blurroundrect",
"~patch_grid",
"~desk_carsvg",
- "~GLInstancedArraysBench"
+ "~GLInstancedArraysBench",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
],
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
"--images",
@@ -77,7 +134,26 @@
"--match",
"~interlaced1.png",
"~interlaced2.png",
- "~interlaced3.png"
+ "~interlaced3.png",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
],
"Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
"--images",
@@ -102,7 +178,26 @@
"~etc1bitmap",
"~interlaced1.png",
"~interlaced2.png",
- "~interlaced3.png"
+ "~interlaced3.png",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
],
"Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug": [
"--images",
@@ -125,6 +220,25 @@
"~patch_grid",
"~desk_carsvg",
"~keymobi",
- "~path_hairline"
+ "~path_hairline",
+ "~inc0.gif",
+ "~inc1.gif",
+ "~incInterlaced.gif",
+ "~inc0.jpg",
+ "~incGray.jpg",
+ "~inc0.wbmp",
+ "~inc1.wbmp",
+ "~inc0.webp",
+ "~inc1.webp",
+ "~inc0.ico",
+ "~inc1.ico",
+ "~inc0.png",
+ "~inc1.png",
+ "~inc2.png",
+ "~inc12.png",
+ "~inc13.png",
+ "~inc14.png",
+ "~inc0.webp",
+ "~inc1.webp"
]
}
\ No newline at end of file
diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 2d5516f..50bfc9f 100755
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -91,6 +91,28 @@
match.append('~interlaced2.png')
match.append('~interlaced3.png')
+ # We do not need or want to benchmark the decodes of incomplete images.
+ # In fact, in nanobench we assert that the full image decode succeeds.
+ match.append('~inc0.gif')
+ match.append('~inc1.gif')
+ match.append('~incInterlaced.gif')
+ match.append('~inc0.jpg')
+ match.append('~incGray.jpg')
+ match.append('~inc0.wbmp')
+ match.append('~inc1.wbmp')
+ match.append('~inc0.webp')
+ match.append('~inc1.webp')
+ match.append('~inc0.ico')
+ match.append('~inc1.ico')
+ match.append('~inc0.png')
+ match.append('~inc1.png')
+ match.append('~inc2.png')
+ match.append('~inc12.png')
+ match.append('~inc13.png')
+ match.append('~inc14.png')
+ match.append('~inc0.webp')
+ match.append('~inc1.webp')
+
if match:
args.append('--match')
args.extend(match)