Fix build targets for some bots

Valgrind bot is not building nanobench. Some bots are building nanobench and then not running it.

BUG=skia:

Review URL: https://codereview.chromium.org/1412243004

diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 71260bcd60c42952a421eef420d1cecc170119d7..0770550d260f71772b500eae18a59f47a6855199 100644 (file)
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -132,6 +132,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "--match", 
       "~tabl_mozilla_0", 
       "~desk_yahoonews_0"
@@ -297,6 +373,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "--match", 
       "~tabl_mozilla_0", 
       "~desk_yahoonews_0"
@@ -460,6 +612,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "--match", 
       "~tabl_mozilla_0", 
       "~desk_yahoonews_0"
@@ -629,7 +857,83 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -682,6 +986,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -796,6 +1101,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -824,7 +1205,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -857,6 +1242,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -972,6 +1358,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -1000,7 +1462,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -1033,6 +1499,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -1147,6 +1614,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -1175,7 +1718,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -1207,6 +1754,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -1301,24 +1849,100 @@
       "pal8oversizepal.bmp", 
       "_", 
       "image", 
-      "subset", 
-      "4bpp-pixeldata-cropped.bmp", 
+      "subset", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
       "_", 
       "image", 
-      "subset", 
-      "8bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc13.png", 
       "_", 
       "image", 
-      "subset", 
-      "24bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc14.png", 
       "_", 
       "image", 
       "subset", 
-      "32bpp-pixeldata-cropped.bmp", 
+      "inc0.webp", 
       "_", 
       "image", 
-      "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico", 
+      "subset", 
+      "inc1.webp", 
       "_", 
       "image", 
       "decode", 
@@ -1357,7 +1981,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -1390,6 +2018,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -1505,6 +2134,82 @@
       "_", 
       "image", 
       "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
       "_", 
       "_", 
       "image", 
@@ -1540,7 +2245,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -1573,6 +2282,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -1688,6 +2398,82 @@
       "_", 
       "image", 
       "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
       "_", 
       "_", 
       "image", 
@@ -1723,7 +2509,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -1752,6 +2542,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -1863,7 +2654,83 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -2000,28 +2867,104 @@
       "pal8os2v2-16.bmp", 
       "_", 
       "image", 
-      "subset", 
-      "pal8oversizepal.bmp", 
+      "subset", 
+      "pal8oversizepal.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
       "_", 
       "image", 
-      "subset", 
-      "4bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc12.png", 
       "_", 
       "image", 
-      "subset", 
-      "8bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc13.png", 
       "_", 
       "image", 
-      "subset", 
-      "24bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc14.png", 
       "_", 
       "image", 
       "subset", 
-      "32bpp-pixeldata-cropped.bmp", 
+      "inc0.webp", 
       "_", 
       "image", 
-      "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico", 
+      "subset", 
+      "inc1.webp", 
       "--match", 
       "~tabl_mozilla_0", 
       "~desk_yahoonews_0"
@@ -2032,6 +2975,7 @@
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--match", 
       "~blurroundrect", 
       "~patch_grid", 
@@ -2070,6 +3014,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -2184,6 +3129,82 @@
       "_", 
       "image", 
       "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
       "_", 
       "_", 
       "image", 
@@ -2208,6 +3229,7 @@
       "GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_arch_type=x86_64 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -2219,7 +3241,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": true
@@ -2359,6 +3385,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "--match", 
       "~tabl_mozilla_0", 
       "~desk_yahoonews_0"
@@ -2369,6 +3471,7 @@
       "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -2421,6 +3524,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -2535,6 +3639,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -2563,7 +3743,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -2598,6 +3782,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -2691,24 +3876,100 @@
       "pal8oversizepal.bmp", 
       "_", 
       "image", 
-      "subset", 
-      "4bpp-pixeldata-cropped.bmp", 
+      "subset", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
       "_", 
       "image", 
-      "subset", 
-      "8bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc13.png", 
       "_", 
       "image", 
-      "subset", 
-      "24bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc14.png", 
       "_", 
       "image", 
       "subset", 
-      "32bpp-pixeldata-cropped.bmp", 
+      "inc0.webp", 
       "_", 
       "image", 
-      "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico", 
+      "subset", 
+      "inc1.webp", 
       "_", 
       "image", 
       "_", 
@@ -2730,6 +3991,7 @@
       "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_run_pdfviewer_in_gm=1 skia_warnings_as_errors=0"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -2741,7 +4003,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -2775,8 +4041,11 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "remote-8888", 
+      "remote_cache-8888", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -2891,6 +4160,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -2921,7 +4266,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": false, 
     "upload_perf_results": false
@@ -2956,8 +4305,11 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "remote-8888", 
+      "remote_cache-8888", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -3072,6 +4424,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -3101,7 +4529,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -3136,8 +4568,11 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "remote-8888", 
+      "remote_cache-8888", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -3252,6 +4687,82 @@
       "Hopstarter-Mac-Folders-Apple.ico", 
       "_", 
       "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
       "_", 
       "interlaced1.png", 
       "_", 
@@ -3281,7 +4792,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -3316,8 +4831,11 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "sp-8888", 
+      "remote-8888", 
+      "remote_cache-8888", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -3416,20 +4934,96 @@
       "4bpp-pixeldata-cropped.bmp", 
       "_", 
       "image", 
-      "subset", 
-      "8bpp-pixeldata-cropped.bmp", 
+      "subset", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
       "_", 
       "image", 
-      "subset", 
-      "24bpp-pixeldata-cropped.bmp", 
+      "decode", 
+      "inc14.png", 
       "_", 
       "image", 
       "subset", 
-      "32bpp-pixeldata-cropped.bmp", 
+      "inc0.webp", 
       "_", 
       "image", 
-      "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico", 
+      "subset", 
+      "inc1.webp", 
       "_", 
       "image", 
       "_", 
@@ -3460,14 +5054,19 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
   }, 
   "Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": {
     "build_targets": [
-      "dm"
+      "dm", 
+      "nanobench"
     ], 
     "builder_cfg": {
       "arch": "x86_64", 
@@ -3497,6 +5096,7 @@
       "nvprmsaa16", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -3608,6 +5208,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "pdf", 
       "_", 
       "_", 
@@ -3653,6 +5329,7 @@
       "GYP_DEFINES": "skia_arch_type=x86_64 skia_release_optimization_level=1 skia_warnings_as_errors=0"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -3668,15 +5345,18 @@
       "--loops", 
       "1", 
       "--samples", 
-      "1"
+      "1", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": false, 
     "upload_perf_results": false
   }, 
   "Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug": {
     "build_targets": [
-      "dm", 
-      "nanobench"
+      "dm"
     ], 
     "builder_cfg": {
       "arch": "x86_64", 
@@ -3704,6 +5384,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -3819,6 +5500,82 @@
       "_", 
       "image", 
       "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
       "_", 
       "_", 
       "image", 
@@ -3854,7 +5611,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -3890,6 +5651,7 @@
       "upright-matrix-gpu", 
       "msaa16", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -4005,6 +5767,82 @@
       "_", 
       "image", 
       "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
       "_", 
       "_", 
       "image", 
@@ -4029,6 +5867,7 @@
       "GYP_DEFINES": "qt_sdk=C:/Qt/Qt5.1.0/5.1.0/msvc2012_64/ skia_angle=1 skia_arch_type=x86 skia_warnings_as_errors=0 skia_win_debuggers_path=c:/DbgHelp"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 
@@ -4040,7 +5879,11 @@
       "angle", 
       "hwui", 
       "msaa16", 
-      "nvprmsaa16"
+      "nvprmsaa16", 
+      "--match", 
+      "~interlaced1.png", 
+      "~interlaced2.png", 
+      "~interlaced3.png"
     ], 
     "upload_dm_results": true, 
     "upload_perf_results": false
@@ -4074,6 +5917,7 @@
       "upright-matrix-8888", 
       "upright-matrix-gpu", 
       "pdf", 
+      "pdf_poppler", 
       "serialize-8888", 
       "tiles_rt-8888", 
       "pipe-8888", 
@@ -4185,6 +6029,82 @@
       "image", 
       "decode", 
       "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "incInterlaced.gif", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "incGray.jpg", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.wbmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.webp", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.ico", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc0.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc1.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc2.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc12.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc13.png", 
+      "_", 
+      "image", 
+      "decode", 
+      "inc14.png", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc0.webp", 
+      "_", 
+      "image", 
+      "subset", 
+      "inc1.webp", 
       "gpu", 
       "skp", 
       "_", 
@@ -4224,6 +6144,7 @@
       "GYP_DEFINES": "skia_arch_type=arm skia_clang_build=1 skia_os=ios skia_warnings_as_errors=0"
     }, 
     "nanobench_flags": [
+      "--images", 
       "--scales", 
       "1.0", 
       "1.1", 

diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index 0f7d2527af44a0d0ede26161934236a251f382f5..b81ee40aa39c64180b061956977c8d463f8920c1 100755 (executable)
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -171,20 +171,19 @@ def get_extra_env_vars(builder_dict):
 
 
 cov_skip.extend([lineno(), lineno() + 1])
-def build_targets_from_builder_dict(builder_dict):
+def build_targets_from_builder_dict(builder_dict, do_test_steps, do_perf_steps):
   """Return a list of targets to build, depending on the builder type."""
   if builder_dict['role'] in ('Test', 'Perf') and builder_dict['os'] == 'iOS':
     return ['iOSShell']
-  elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_TEST:
-    t = ['dm']
-    if builder_dict.get('configuration') == 'Debug':
-      t.append('nanobench')
+  if builder_dict.get('extra_config') == 'Appurify':
+    return ['VisualBenchTest_APK']
+  t = []
+  if do_test_steps:
+    t.append('dm')
+  if do_perf_steps:
+    t.append('nanobench')
+  if t:
     return t
-  elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_PERF:
-    if builder_dict.get('extra_config') == 'Appurify':
-      return ['VisualBenchTest_APK']
-    else:
-      return ['nanobench']
   else:
     return ['most']
 
@@ -240,7 +239,6 @@ def get_builder_spec(builder_name):
   gyp_defs_list.sort()
   env['GYP_DEFINES'] = ' '.join(gyp_defs_list)
   rv = {
-    'build_targets': build_targets_from_builder_dict(builder_dict),
     'builder_cfg': builder_dict,
     'dm_flags': dm_flags.get_args(builder_name),
     'env': env,
@@ -265,6 +263,8 @@ def get_builder_spec(builder_name):
                          (role == builder_name_schema.BUILDER_ROLE_TEST and
                           configuration == CONFIG_DEBUG) or
                          'Valgrind' in builder_name)
+  rv['build_targets'] = build_targets_from_builder_dict(
+        builder_dict, rv['do_test_steps'], rv['do_perf_steps'])
 
   # Do we upload perf results?
   upload_perf_results = False