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

Unified Diff: infra/bots/flavor/default_flavor.py

Issue 1743113003: Add test_skia.py, isolates for test_skia, images, skps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Address comments Created 4 years, 10 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 | « infra/bots/download_skps.py ('k') | infra/bots/images.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: infra/bots/flavor/default_flavor.py
diff --git a/infra/bots/flavor/default_flavor.py b/infra/bots/flavor/default_flavor.py
index 5263073744c496f07ba486c1374d6e2030717584..3603f043aab6cfd8d30e3c45696632881101d092 100644
--- a/infra/bots/flavor/default_flavor.py
+++ b/infra/bots/flavor/default_flavor.py
@@ -71,10 +71,10 @@ class DefaultFlavorUtils(object):
self._bot_info = bot_info
self.chrome_path = os.path.join(os.path.expanduser('~'), 'src')
- def step(self, cmd, **kwargs):
+ def run(self, cmd, **kwargs):
"""Runs a step as appropriate for this flavor."""
- path_to_app = self._bot_info.out_dir.join(
- self._bot_info.configuration, cmd[0])
+ path_to_app = os.path.join(self._bot_info.out_dir,
+ self._bot_info.configuration, cmd[0])
if (sys.platform == 'linux' and
'x86_64' in self._bot_info.bot_name and
not 'TSAN' in self._bot_info.bot_name):
@@ -141,7 +141,8 @@ class DefaultFlavorUtils(object):
def create_clean_host_dir(self, path):
"""Convenience function for creating a clean directory."""
- shutil.rmtree(path)
+ if os.path.exists(path):
+ shutil.rmtree(path)
os.makedirs(path)
def install(self):
@@ -161,7 +162,7 @@ class DefaultFlavorUtils(object):
"""
join = lambda p: os.path.join(self._bot_info.build_dir, p)
return DeviceDirs(
- dm_dir=join('dm'),
+ dm_dir=os.path.join(self._bot_info.swarm_out_dir, 'dm'),
perf_data_dir=self._bot_info.perf_data_dir,
resource_dir=self._bot_info.resource_dir,
images_dir=join('images'),
« no previous file with comments | « infra/bots/download_skps.py ('k') | infra/bots/images.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698