Commit ca5c0a64 authored by Kevin Marshall's avatar Kevin Marshall Committed by Commit Bot

Fuchsia: Perform script-relative path resolution for manifest files.

A previous CL regressed this behavior, leading to the generated runner
being generated with absolute paths in the buildbot's filesystem.

Change-Id: I16aaca1556c9f8eccc81d3cdd841b4a3c71de3f2
Reviewed-on: https://chromium-review.googlesource.com/978639Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Kevin Marshall <kmarshall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545605}
parent f8b3f6ef
...@@ -55,6 +55,7 @@ def main(args): ...@@ -55,6 +55,7 @@ def main(args):
group = parser.add_argument_group('Test runner path arguments.') group = parser.add_argument_group('Test runner path arguments.')
group.add_argument('--output-directory') group.add_argument('--output-directory')
group.add_argument('--package') group.add_argument('--package')
group.add_argument('--package-manifest')
args, runner_args = parser.parse_known_args(args) args, runner_args = parser.parse_known_args(args)
def RelativizePathToScript(path): def RelativizePathToScript(path):
...@@ -70,6 +71,8 @@ def main(args): ...@@ -70,6 +71,8 @@ def main(args):
('--output-directory', RelativizePathToScript(args.output_directory))) ('--output-directory', RelativizePathToScript(args.output_directory)))
runner_path_args.append( runner_path_args.append(
('--package', RelativizePathToScript(args.package))) ('--package', RelativizePathToScript(args.package)))
runner_path_args.append(
('--package-manifest', RelativizePathToScript(args.package_manifest)))
with open(args.script_output_path, 'w') as script: with open(args.script_output_path, 'w') as script:
script.write(SCRIPT_TEMPLATE.format( script.write(SCRIPT_TEMPLATE.format(
......
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