Commit fba3e64e by Jonah Ryan-Davis Committed by Commit Bot

Update trigger.py to take extra arguments

The extra_args wildcard doesn't support extra arguments prepended with '--'. By using the unknown args returned by argparse, you can add arbitrary args to the swarming call. Bug: angleproject:3272 Change-Id: I8d4ab1e19ceae80b47cc2331e6e30a4187da863f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1695921Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
parent b91900a2
...@@ -21,12 +21,11 @@ def parse_args(): ...@@ -21,12 +21,11 @@ def parse_args():
parser.add_argument('gpu_dim', help='GPU dimension. (e.g. intel-hd-630-win10-stable)') parser.add_argument('gpu_dim', help='GPU dimension. (e.g. intel-hd-630-win10-stable)')
parser.add_argument('-s', '--shards', default=1, help='number of shards', type=int) parser.add_argument('-s', '--shards', default=1, help='number of shards', type=int)
parser.add_argument('-p', '--pool', default='Chrome-GPU', help='swarming pool') parser.add_argument('-p', '--pool', default='Chrome-GPU', help='swarming pool')
parser.add_argument('extra_args', help='extra test command line arguments', nargs='*') return parser.parse_known_args()
return parser.parse_args()
def main(): def main():
args = parse_args() args, unknown = parse_args()
path = args.gn_path.replace('\\', '/') path = args.gn_path.replace('\\', '/')
out_gn_path = '//' + path out_gn_path = '//' + path
out_file_path = os.path.join(*path.split('/')) out_file_path = os.path.join(*path.split('/'))
...@@ -55,8 +54,9 @@ def main(): ...@@ -55,8 +54,9 @@ def main():
'--shards=%d' % args.shards, '-s', sha '--shards=%d' % args.shards, '-s', sha
] ]
if args.extra_args: if unknown:
swarmings_args += ['--'] + args.extra_args swarmings_args += ["--"] + unknown
print(' '.join(swarmings_args)) print(' '.join(swarmings_args))
subprocess.call(swarmings_args) subprocess.call(swarmings_args)
......
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