Swarming bots: add build products whitelist

infra/bots/common.py

 #!/usr/bin/env python
 #
 # Copyright 2016 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 import contextlib
 import math
@@ skipping 13 matching lines @@
 from flavor import ios_flavor
 from flavor import valgrind_flavor
 from flavor import xsan_flavor
 
 
 CONFIG_COVERAGE = 'Coverage'
 CONFIG_DEBUG = 'Debug'
 CONFIG_RELEASE = 'Release'
 VALID_CONFIGS = (CONFIG_COVERAGE, CONFIG_DEBUG, CONFIG_RELEASE)
 
+BUILD_PRODUCTS_WHITELIST = [
+  'dm', 'dm.exe',
+  'nanobench', 'nanobench.exe',
+]
+
 GM_ACTUAL_FILENAME = 'actual-results.json'
 GM_EXPECTATIONS_FILENAME = 'expected-results.json'
 GM_IGNORE_TESTS_FILENAME = 'ignored-tests.txt'
 
 GOLD_UNINTERESTING_HASHES_URL = 'https://gold.skia.org/_/hashes'
 
 GS_GM_BUCKET = 'chromium-skia-gm'
 GS_SUMMARIES_BUCKET = 'chromium-skia-gm-summaries'
 
 GS_SUBDIR_TMPL_SK_IMAGE = 'skimage/v%s'
@@ skipping 103 matching lines @@
     """
     self.name = bot_name
     self.skia_dir = os.path.abspath(os.path.join(
         os.path.dirname(os.path.realpath(__file__)),
         os.pardir, os.pardir))
     self.swarm_out_dir = swarm_out_dir
     os.chdir(self.skia_dir)
     self.build_dir = os.path.abspath(os.path.join(self.skia_dir, os.pardir))
     self.spec = self.get_bot_spec(bot_name)
     self.bot_cfg = self.spec['builder_cfg']
-    if self.bot_cfg['role'] == 'Build':
-      self.out_dir = os.path.join(swarm_out_dir, 'out')
-    else:
-      self.out_dir = os.path.join(os.pardir, 'out')
+    self.out_dir = os.path.join(os.pardir, 'out')
     self.configuration = self.spec['configuration']
     self.default_env = {
       'SKIA_OUT': self.out_dir,
       'BUILDTYPE': self.configuration,
       'PATH': os.environ['PATH'],
     }
     self.default_env.update(self.spec['env'])
     self.build_targets = [str(t) for t in self.spec['build_targets']]
     self.is_trybot = self.bot_cfg['is_trybot']
     self.upload_dm_results = self.spec['upload_dm_results']
@@ skipping 64 matching lines @@
     print '============'
     print 'CMD: %s' % cmd
     print 'CWD: %s' % cwd
     print 'ENV: %s' % _env
     print '============'
     subprocess.check_call(cmd, env=_env, cwd=cwd)
 
   def compile_steps(self):
     for t in self.build_targets:
       self.flavor.compile(t)
+    dst = os.path.join(self.swarm_out_dir, 'out', self.configuration)
+    os.makedirs(dst)
+    for f in BUILD_PRODUCTS_WHITELIST:
+      path = os.path.join(self.out_dir, self.configuration, f)
+      if os.path.exists(path):
+        print 'Copying build product %s' % path
+        shutil.copy(path, dst)
 
   def _run_once(self, fn, *args, **kwargs):
     if not fn.__name__ in self._already_ran:
       self._already_ran[fn.__name__] = True
       fn(*args, **kwargs)
 
   def install(self):
     """Copy the required executables and files to the device."""
     self.device_dirs = self.flavor.get_device_dirs()
 
@@ skipping 192 matching lines @@
       self.flavor.run(abandonGpuContext, env=self.default_env)
 
     # Copy results to host.
     if self.upload_perf_results:
       if not os.path.exists(self.perf_data_dir):
         os.makedirs(self.perf_data_dir)
       self.flavor.copy_directory_contents_to_host(
           self.device_dirs.perf_data_dir, self.perf_data_dir)
 
     self.flavor.cleanup_steps()