Add buildbot_spec info for Appurify bot

BUG=skia:4093

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

2 files changed, 527 insertions, 13 deletions

diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 2992ea2dba..9768f6d584 100644
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -793,7 +793,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -956,7 +968,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1126,7 +1150,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1297,7 +1333,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1468,7 +1516,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": false, 
@@ -1651,6 +1711,172 @@
     "upload_dm_results": true, 
     "upload_perf_results": false
   }, 
+  "Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify": {
+    "build_targets": [
+      "VisualBenchTest_APK"
+    ], 
+    "builder_cfg": {
+      "arch": "Arm7", 
+      "compiler": "GCC", 
+      "configuration": "Release", 
+      "cpu_or_gpu": "GPU", 
+      "cpu_or_gpu_value": "Adreno330", 
+      "extra_config": "Appurify", 
+      "is_trybot": false, 
+      "model": "Nexus5", 
+      "os": "Android", 
+      "role": "Perf"
+    }, 
+    "configuration": "Release", 
+    "device_cfg": "arm_v7", 
+    "dm_flags": [
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "msaa4", 
+      "serialize-8888", 
+      "tiles_rt-8888", 
+      "pipe-8888", 
+      "--src", 
+      "tests", 
+      "gm", 
+      "--blacklist", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v4.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v5.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565pal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32-111110.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32bf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32abf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb24largepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2-16.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8oversizepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal4rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "rgb24largepal.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "pal8os2v2-16.bmp", 
+      "_", 
+      "image", 
+      "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", 
+      "--match", 
+      "~tabl_mozilla_0", 
+      "~desk_yahoonews_0"
+    ], 
+    "do_perf_steps": true, 
+    "do_test_steps": false, 
+    "env": {
+      "BUILDTYPE": "Debug", 
+      "GYP_DEFINES": "skia_arch_type=arm skia_warnings_as_errors=0"
+    }, 
+    "nanobench_flags": [
+      "--scales", 
+      "1.0", 
+      "1.1", 
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "nonrendering", 
+      "angle", 
+      "hwui", 
+      "msaa4", 
+      "nvprmsaa4", 
+      "--match", 
+      "~blurroundrect", 
+      "~patch_grid", 
+      "~desk_carsvg"
+    ], 
+    "upload_dm_results": true, 
+    "upload_perf_results": true
+  }, 
   "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot": {
     "build_targets": [
       "nanobench"
@@ -1799,7 +2025,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": false, 
@@ -2131,7 +2369,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": true, 
     "do_test_steps": true, 
@@ -2295,7 +2545,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -2321,6 +2583,186 @@
     "upload_dm_results": true, 
     "upload_perf_results": false
   }, 
+  "Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage": {
+    "build_targets": [
+      "dm"
+    ], 
+    "builder_cfg": {
+      "arch": "x86_64", 
+      "compiler": "Clang", 
+      "configuration": "Coverage", 
+      "cpu_or_gpu": "CPU", 
+      "cpu_or_gpu_value": "AVX2", 
+      "is_trybot": false, 
+      "model": "GCE", 
+      "os": "Ubuntu", 
+      "role": "Test"
+    }, 
+    "configuration": "Coverage", 
+    "dm_flags": [
+      "--matrix", 
+      "0", 
+      "1", 
+      "1", 
+      "0", 
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "upright-matrix-8888", 
+      "upright-matrix-gpu", 
+      "sp-8888", 
+      "msaa16", 
+      "pdf", 
+      "serialize-8888", 
+      "tiles_rt-8888", 
+      "pipe-8888", 
+      "--src", 
+      "tests", 
+      "gm", 
+      "image", 
+      "--blacklist", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v4.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8v5.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb16-565pal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32-111110.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb32bf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgba32abf.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "rgb24largepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8os2v2-16.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8oversizepal.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal4rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "pal8rletrns.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "4bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "8bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "24bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "decode", 
+      "32bpp-pixeldata-cropped.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "rgb24largepal.bmp", 
+      "_", 
+      "image", 
+      "subset", 
+      "pal8os2v2-16.bmp", 
+      "_", 
+      "image", 
+      "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", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
+    ], 
+    "do_perf_steps": false, 
+    "do_test_steps": true, 
+    "env": {
+      "CC": "/usr/bin/clang-3.6", 
+      "CXX": "/usr/bin/clang++-3.6", 
+      "GYP_DEFINES": "skia_arch_type=x86_64 skia_clang_build=1 skia_gpu=0 skia_warnings_as_errors=0"
+    }, 
+    "nanobench_flags": [
+      "--scales", 
+      "1.0", 
+      "1.1", 
+      "--config", 
+      "565", 
+      "8888", 
+      "gpu", 
+      "nonrendering", 
+      "angle", 
+      "hwui", 
+      "msaa16", 
+      "nvprmsaa16"
+    ], 
+    "upload_dm_results": false, 
+    "upload_perf_results": false
+  }, 
   "Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD": {
     "build_targets": [
       "dm"
@@ -2464,7 +2906,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -2631,7 +3085,19 @@
       "_", 
       "image", 
       "decode", 
-      "Hopstarter-Mac-Folders-Apple.ico"
+      "Hopstarter-Mac-Folders-Apple.ico", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -2822,6 +3288,18 @@
       "skp", 
       "_", 
       "desk_wikipedia.skp", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png", 
       "--match", 
       "~Threaded"
     ], 
@@ -3001,7 +3479,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
@@ -3175,7 +3665,19 @@
       "_", 
       "image", 
       "subset", 
-      "_"
+      "_", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced1.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced2.png", 
+      "_", 
+      "image", 
+      "_", 
+      "interlaced3.png"
     ], 
     "do_perf_steps": false, 
     "do_test_steps": true, 
diff --git a/tools/buildbot_spec.py b/tools/buildbot_spec.py
index 9830e45289..e9498decdb 100755
--- a/tools/buildbot_spec.py
+++ b/tools/buildbot_spec.py
@@ -162,6 +162,13 @@ def get_extra_env_vars(builder_dict):
   elif builder_dict.get('compiler') == 'Clang':
     env['CC'] = '/usr/bin/clang'
     env['CXX'] = '/usr/bin/clang++'
+
+  # Force Debug mode for Appurify bots so that we don't have to sign the test
+  # APK.
+  # TODO(borenet): Remove this once able.
+  if builder_dict.get('extra_config') == 'Appurify':
+    env['BUILDTYPE'] = CONFIG_DEBUG
+
   return env
 
 
@@ -176,7 +183,10 @@ def build_targets_from_builder_dict(builder_dict):
       t.append('nanobench')
     return t
   elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_PERF:
-    return ['nanobench']
+    if builder_dict.get('extra_config') == 'Appurify':
+      return ['VisualBenchTest_APK']
+    else:
+      return ['nanobench']
   else:
     return ['most']
 
@@ -300,10 +310,12 @@ def self_test():
         'Build-Ubuntu-GCC-x86_64-Release-Mesa',
         'Housekeeper-PerCommit',
         'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
+        'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify',
         'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
         'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
         'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
         'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
+        'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage',
         'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD',
         'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared',
         'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',