infra/bots/flavor/default_flavor.py - Issue 1813443003: Some fixes for Swarming bots

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: infra/bots/flavor/default_flavor.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:

Index: infra/bots/flavor/default_flavor.py

diff --git a/infra/bots/flavor/default_flavor.py b/infra/bots/flavor/default_flavor.py

index 5933b6c3cf409139695036e707fc791bc1b6eb3b..5cf0eee85b2142e26160c89e7dbf2be7806909e9 100644

--- a/infra/bots/flavor/default_flavor.py

+++ b/infra/bots/flavor/default_flavor.py

@@ -75,11 +75,13 @@ class DefaultFlavorUtils(object):

"""Runs a step as appropriate for this flavor."""

path_to_app = os.path.join(self._bot_info.out_dir,

self._bot_info.configuration, cmd[0])

- if (sys.platform == 'linux' and

+ if ('linux' in sys.platform and

'x86_64' in self._bot_info.bot_name and

not 'TSAN' in self._bot_info.bot_name):

new_cmd = ['catchsegv', path_to_app]

else:

+ if sys.platform == 'win32':

+ path_to_app += '.exe'

new_cmd = [path_to_app]

new_cmd.extend(cmd[1:])

return self._bot_info.run(new_cmd, **kwargs)

« no previous file with comments | « infra/bots/common.py ('k') | infra/bots/win_toolchain_utils.py » ('j') | no next file with comments »