Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Unified Diff: infra/bots/common.py

Issue 1813443003: Some fixes for Swarming bots (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Narrow down build products Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | infra/bots/flavor/default_flavor.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/common.py
diff --git a/infra/bots/common.py b/infra/bots/common.py
index b154ec4d6eb8812f7592ce6c1e8b47a1d05274a9..d4f317af4c845870fa897860adfef9ce622f1084 100644
--- a/infra/bots/common.py
+++ b/infra/bots/common.py
@@ -7,6 +7,7 @@
import contextlib
+import glob
import math
import os
import psutil
@@ -33,8 +34,12 @@ 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'
@@ -256,11 +261,11 @@ class BotInfo(object):
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):
« no previous file with comments | « no previous file | infra/bots/flavor/default_flavor.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698