Appurify bot: don't use flags that visualbench doesn't support

Depends on https://codereview.chromium.org/1320423005/
BUG=skia:4277

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

diff --git a/tools/buildbot_spec.json b/tools/buildbot_spec.json
index 9768f6d..4c25c10 100644 (file)
--- a/tools/buildbot_spec.json
+++ b/tools/buildbot_spec.json
@@ -1853,22 +1853,9 @@
     "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", 

diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py
index 5b4a968..d8bfafc 100755 (executable)
--- a/tools/nanobench_flags.py
+++ b/tools/nanobench_flags.py
@@ -29,22 +29,24 @@ cov_start = lineno()+1   # We care about coverage starting just past this def.
 def get_args(bot):
   args = []
 
-  args.extend(['--scales', '1.0', '1.1'])
+  if 'Appurify' not in bot:
+    args.extend(['--scales', '1.0', '1.1'])
 
   if 'iOS' in bot:
     args.extend(['--skps', 'ignore_skps'])
 
-  config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
-  # The S4 crashes and the NP produces a long error stream when we run with
-  # MSAA.
-  if ('GalaxyS4'    not in bot and
-      'NexusPlayer' not in bot):
-    if 'Android' in bot:
-      config.extend(['msaa4', 'nvprmsaa4'])
-    else:
-      config.extend(['msaa16', 'nvprmsaa16'])
-  args.append('--config')
-  args.extend(config)
+  if 'Appurify' not in bot:
+    config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
+    # The S4 crashes and the NP produces a long error stream when we run with
+    # MSAA.
+    if ('GalaxyS4'    not in bot and
+        'NexusPlayer' not in bot):
+      if 'Android' in bot:
+        config.extend(['msaa4', 'nvprmsaa4'])
+      else:
+        config.extend(['msaa16', 'nvprmsaa16'])
+    args.append('--config')
+    args.extend(config)
 
   if 'Valgrind' in bot:
     # Don't care about Valgrind performance.