chromium/src
0
Fork 0
Code Activity

Update swarming docs and run-swarmed.py for Windows

Browse Source 
The swarming docs don't make it obvious how to tools/luci-go/isolate on
Windows (Is it a shell script? A Python script? An executable? In
chromium or in depot_tools?) so this change updates the documentation to
make it more explicit.

This change also updates run-swarmed.py so that it works correctly on
Windows - this is easily done now that Python 3 is being used along the
whole depth of this stack.

The bug was previously marked as fixed (because the scripts were updated
to Python 3) but the non-portable code was not actually removed. After
this change there are no more TODOs for this bug.

Bug: 1268955
Change-Id: I4f2bd5e9684cb75ef920d7c28391387c4332999b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4266010
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
Auto-Submit: Bruce Dawson <brucedawson@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1107870}
This commit is contained in:
Bruce Dawson
2023-02-21 19:16:05 +00:00
committed by Chromium LUCI CQ
parent c4a2c0b08e
commit 66f8265c51
2 changed files with 9 additions and 7 deletions

6
docs/workflow/debugging-with-swarming.md

@ -173,7 +173,11 @@ You may need to log in to `https://chromium-swarm.appspot.com` to do this
$ tools/luci-go/isolate login
```
Use your google.com account for this.
Use your google.com account for this. On Windows the command would be:
```
$ tools\luci-go\isolate.exe login
```
## Uploading an isolate

10
tools/run-swarmed.py

@ -285,9 +285,7 @@ def main():
elif args.target_os == 'android':
args.arch = gn_args.get('target_cpu', 'detect')
# TODO(crbug.com/1268955): Use sys.executable and remove os-specific logic
# once mb.py is in python3
mb_cmd = ['tools/mb/mb', 'isolate']
mb_cmd = [sys.executable, 'tools/mb/mb.py', 'isolate']
if not args.build:
mb_cmd.append('--no-build')
if args.isolate_map_file:
@ -310,9 +308,9 @@ def main():
with open(archive_json) as f:
cas_digest = json.load(f).get(args.target_name)
# TODO(crbug.com/1268955): Use sys.executable and remove os-specific logic
# once mb.py is in python3
mb_cmd = ['tools/mb/mb', 'get-swarming-command', '--as-list']
mb_cmd = [
sys.executable, 'tools/mb/mb.py', 'get-swarming-command', '--as-list'
]
if not args.build:
mb_cmd.append('--no-build')
if args.isolate_map_file: