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: Courtney Goeltzenleuchter <courtneygo@google.com>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
This commit is contained in:
Jamie Madill
2020-10-12 22:21:06 -04:00
committed by Commit Bot
parent 707af6e5b0
commit 0059e75cfe

View File

@@ -88,19 +88,24 @@ def main():
if args.device_os:
swarming_args += ['-d', 'device_os=' + args.device_os]
for i in range(args.shards):
shard_args = swarming_args[:]
shard_args.extend([
'--env',
'GTEST_TOTAL_SHARDS=%d' % args.shards,
'--env',
'GTEST_SHARD_INDEX=%d' % i,
])
if unknown:
shard_args += ["--"] + unknown
if args.shards > 1:
for i in range(args.shards):
shard_args = swarming_args[:]
shard_args.extend([
'--env',
'GTEST_TOTAL_SHARDS=%d' % args.shards,
'--env',
'GTEST_SHARD_INDEX=%d' % i,
])
if unknown:
shard_args += ["--"] + unknown
logging.info(' '.join(shard_args))
subprocess.call(shard_args)
logging.info(' '.join(shard_args))
subprocess.call(shard_args)
else:
if unknown:
swarming_args += ["--"] + unknown
subprocess.call(swarming_args)
return 0