Skip to content

A
angle
Commit 0059e75c by Jamie Madill Committed by Commit Bot
Options

trigger.py: Remove GTest shard env when running one shard.

Bug: angleproject:5158 Change-Id: I3c29adf36f6f31f23bf662c2d7d6c4d05d8e9028 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2466781 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCourtney Goeltzenleuchter <courtneygo@google.com> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 707af6e5
Showing with 17 additions and 12 deletions
scripts/trigger.py
...@@ -88,19 +88,24 @@ def main(): ...@@ -88,19 +88,24 @@ def main():
if args.device_os: if args.device_os:
swarming_args += ['-d', 'device_os=' + args.device_os] swarming_args += ['-d', 'device_os=' + args.device_os]
for i in range(args.shards): if args.shards > 1:
shard_args = swarming_args[:] for i in range(args.shards):
shard_args.extend([ shard_args = swarming_args[:]
'--env', shard_args.extend([
'GTEST_TOTAL_SHARDS=%d' % args.shards, '--env',
'--env', 'GTEST_TOTAL_SHARDS=%d' % args.shards,
'GTEST_SHARD_INDEX=%d' % i, '--env',
]) 'GTEST_SHARD_INDEX=%d' % i,
])
if unknown:
shard_args += ["--"] + unknown
logging.info(' '.join(shard_args))
subprocess.call(shard_args)
else:
if unknown: if unknown:
shard_args += ["--"] + unknown swarming_args += ["--"] + unknown
subprocess.call(swarming_args)
logging.info(' '.join(shard_args))
subprocess.call(shard_args)
return 0 return 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment