Some fixes for Swarming bots

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 glob
 import math
 import os
 import psutil
 import shutil
 import socket
 import subprocess
 import sys
 import time
 import urllib2
 
 from flavor import android_flavor
 from flavor import chromeos_flavor
 from flavor import cmake_flavor
 from flavor import coverage_flavor
 from flavor import default_flavor
 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',
+  'dm',
+  'dm.exe',
+  'nanobench',
+  'nanobench.exe',
+  '*.so',
+  '*.dll',
 ]
 
 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'
@@ skipping 201 matching lines @@
     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)
+    for pattern in BUILD_PRODUCTS_WHITELIST:
+      path = os.path.join(self.out_dir, self.configuration, pattern)
+      for f in glob.glob(path):
+          print 'Copying build product %s' % f
+          shutil.copy(f, dst)
     self.cleanup()
 
   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 204 matching lines @@
   def cleanup(self):
     if sys.platform == 'win32':
       # Kill mspdbsrv.exe, which tends to hang around after the build finishes.
       for p in psutil.process_iter():
         try:
           if p.name == 'mspdbsrv.exe':
             p.kill()
         except psutil._error.AccessDenied:
           pass
     self.flavor.cleanup_steps()