Disable svgs on nanobench when running on Valgrind

infra/bots/recipes/swarm_perf.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming perf.
 
 
 DEPS = [
   'build/file',
@@ skipping 26 matching lines @@
       'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-VisualBench',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug',
       'Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release',
       'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
       'Perf-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
     ],
   },
 }
 
 
-import calendar
+import time
 
 
 def nanobench_flags(bot):
   args = ['--pre_log']
 
   if 'GPU' in bot:
     args.append('--images')
     args.extend(['--gpuStatsDump', 'true'])
 
   if 'Android' in bot and 'GPU' in bot:
@@ skipping 125 matching lines @@
     ])
 
   target = 'nanobench'
   if 'VisualBench' in api.vars.builder_name:
     target = 'visualbench'
   args = [
       target,
       '--undefok',   # This helps branches that may not know new flags.
       '-i',       api.flavor.device_dirs.resource_dir,
       '--skps',   api.flavor.device_dirs.skp_dir,
-      '--svgs',   api.flavor.device_dirs.svg_dir,
       '--images', api.flavor.device_path_join(
           api.flavor.device_dirs.images_dir, 'nanobench'),
   ]
 
+  # Do not run svgs on Valgrind.
+  if 'Valgrind' not in api.vars.builder_name:
+    args.extend(['--svgs',  api.flavor.device_dirs.svg_dir])
+
   skip_flag = None
   if api.vars.builder_cfg.get('cpu_or_gpu') == 'CPU':
     skip_flag = '--nogpu'
   elif api.vars.builder_cfg.get('cpu_or_gpu') == 'GPU':
     skip_flag = '--nocpu'
   if skip_flag:
     args.append(skip_flag)
   args.extend(nanobench_flags(api.vars.builder_name))
 
   if api.vars.upload_perf_results:
     now = api.time.utcnow()
-    ts = int(calendar.timegm(now.utctimetuple()))
+    ts = int(time.mktime(now.utctimetuple()))
     json_path = api.flavor.device_path_join(
         api.flavor.device_dirs.perf_data_dir,
         'nanobench_%s_%d.json' % (api.vars.got_revision, ts))
     args.extend(['--outResultsFile', json_path])
     args.extend(properties)
 
     keys_blacklist = ['configuration', 'role', 'is_trybot']
     args.append('--key')
     for k in sorted(api.vars.builder_cfg.keys()):
       if not k in keys_blacklist:
@@ skipping 100 matching lines @@
           buildername='Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-' +
                       'Valgrind-Trybot',
           mastername='client.skia',
           slavename='skiabot-linux-swarm-000',
           buildnumber=5,
           path_config='kitchen',
           swarm_out_dir='[SWARM_OUT_DIR]',
           revision='abc123',
           **gerrit_kwargs)
   )