mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-13 13:50:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use luci-go isolate client in mb.py

Browse source 
Bug: chromium:1059167
Change-Id: Idd3a3101ab09e9119bc99baab5a152dbd3ea6197
Reviewers: dpranke@chromium.org, tikuta@chromium.org
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170520
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Ye Kuang <yekuang@google.com>
Cr-Commit-Position: refs/heads/master@{#30796}
This commit is contained in:
Ye Kuang 2020-03-16 10:56:20 +09:00 committed by Commit Bot
parent 1daff27414
commit b28f0209f9
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools_webrtc/mb/mb.py
View file

@ -56,6 +56,8 @@ class MetaBuildWrapper(object):
self.configs = {} self.configs = {}
self.masters = {} self.masters = {}
self.mixins = {} self.mixins = {}
self.isolate_exe = 'isolate.exe' if self.platform.startswith(
'win') else 'isolate'
def Main(self, args): def Main(self, args):
self.ParseArgs(args) self.ParseArgs(args)
@ -337,8 +339,7 @@ class MetaBuildWrapper(object):
dimensions += ['-d', k, v] dimensions += ['-d', k, v]
cmd = [ cmd = [
self.executable, self.PathJoin(self.src_dir, 'tools', 'luci-go', self.isolate_exe),
self.PathJoin('tools', 'swarming_client', 'isolate.py'),
'archive', 'archive',
'-s', '-s',
self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)), self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)),
@ -364,11 +365,10 @@ class MetaBuildWrapper(object):
def _RunLocallyIsolated(self, build_dir, target): def _RunLocallyIsolated(self, build_dir, target):
cmd = [ cmd = [
self.executable, self.PathJoin(self.src_dir, 'tools', 'luci-go', self.isolate_exe),
self.PathJoin('tools', 'swarming_client', 'isolate.py'),
'run', 'run',
'-s', '-i',
self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target)), self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)),
] ]
if self.args.extra_args: if self.args.extra_args:
cmd += ['--'] + self.args.extra_args cmd += ['--'] + self.args.extra_args
@ -696,13 +696,10 @@ class MetaBuildWrapper(object):
extra_files) extra_files)
ret, _, _ = self.Run([ ret, _, _ = self.Run([
self.executable, self.PathJoin(self.src_dir, 'tools', 'luci-go', self.isolate_exe),
self.PathJoin('tools', 'swarming_client', 'isolate.py'),
'check', 'check',
'-i', '-i',
self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target)), self.ToSrcRelPath('%s/%s.isolate' % (build_dir, target))],
'-s',
self.ToSrcRelPath('%s/%s.isolated' % (build_dir, target))],
buffer_output=False) buffer_output=False)
return ret return ret

2
tools_webrtc/mb/mb_unittest.py
View file

@ -763,7 +763,7 @@ class UnitTest(unittest.TestCase):
} }
def run_stub(cmd, **_kwargs): def run_stub(cmd, **_kwargs):
if 'isolate.py' in cmd[1]: if os.path.join('tools', 'luci-go', 'isolate') in cmd[0]:
return 0, 'fake_hash base_unittests', '' return 0, 'fake_hash base_unittests', ''
else: else:
return 0, '', '' return 0, '', ''