| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 # | 2 # |
| 3 # Copyright 2017 The Chromium Authors. All rights reserved. | 3 # Copyright 2017 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 import argparse | 7 import argparse |
| 8 import json | 8 import json |
| 9 import logging | 9 import logging |
| 10 import os | 10 import os |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 help='(Swarming Isolated Merge Script API) Output JSON file to create.') | 69 help='(Swarming Isolated Merge Script API) Output JSON file to create.') |
| 70 parser.add_argument( | 70 parser.add_argument( |
| 71 '--build-properties', | 71 '--build-properties', |
| 72 help='(Swarming Isolated Merge Script API) Build property JSON file prov
ided by recipes.') | 72 help='(Swarming Isolated Merge Script API) Build property JSON file prov
ided by recipes.') |
| 73 parser.add_argument( | 73 parser.add_argument( |
| 74 '--results-json-override-with-build-property', | 74 '--results-json-override-with-build-property', |
| 75 nargs=2, metavar=('RESULT_JSON_KEY', 'BUILD_PROPERTY_KEY'), default=[], | 75 nargs=2, metavar=('RESULT_JSON_KEY', 'BUILD_PROPERTY_KEY'), default=[], |
| 76 action='append', | 76 action='append', |
| 77 help='Override the value of a value in the result style JSON file ' | 77 help='Override the value of a value in the result style JSON file ' |
| 78 '(--result-jsons-override-value layout_test_dirs /tmp/output).') | 78 '(--result-jsons-override-value layout_test_dirs /tmp/output).') |
| 79 parser.add_argument( |
| 80 '--summary-json', |
| 81 help='(Swarming Isolated Merge Script API) Summary of shard state runnin
g on swarming.' |
| 82 '(Output of the swarming.py collect --task-summary-json=XXX command
.)') |
| 79 | 83 |
| 80 # Script to run after merging the directories together. Normally used with a
rchive_layout_test_results.py | 84 # Script to run after merging the directories together. Normally used with a
rchive_layout_test_results.py |
| 81 # scripts/slave/chromium/archive_layout_test_results.py \ | 85 # scripts/slave/chromium/archive_layout_test_results.py \ |
| 82 # --results-dir /b/rr/tmpIcChUS/w/layout-test-results \ | 86 # --results-dir /b/rr/tmpIcChUS/w/layout-test-results \ |
| 83 # --build-dir /b/rr/tmpIcChUS/w/src/out \ | 87 # --build-dir /b/rr/tmpIcChUS/w/src/out \ |
| 84 # --build-number 3665 \ | 88 # --build-number 3665 \ |
| 85 # --builder-name 'WebKit Linux - RandomOrder' \ | 89 # --builder-name 'WebKit Linux - RandomOrder' \ |
| 86 # --gs-bucket gs://chromium-layout-test-archives \ | 90 # --gs-bucket gs://chromium-layout-test-archives \ |
| 87 # --staging-dir /b/c/chrome_staging \ | 91 # --staging-dir /b/c/chrome_staging \ |
| 88 # --slave-utils-gsutil-py-path /b/rr/tmpIcChUS/rw/scripts/slave/.recipe_
deps/depot_tools/gsutil.py | 92 # --slave-utils-gsutil-py-path /b/rr/tmpIcChUS/rw/scripts/slave/.recipe_
deps/depot_tools/gsutil.py |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 logging.debug('Changing directory to %s', args.output_directory) | 176 logging.debug('Changing directory to %s', args.output_directory) |
| 173 os.chdir(args.output_directory) | 177 os.chdir(args.output_directory) |
| 174 | 178 |
| 175 post_script = list(args.post_merge_script) | 179 post_script = list(args.post_merge_script) |
| 176 post_script.append('--result-dir', args.output_directory) | 180 post_script.append('--result-dir', args.output_directory) |
| 177 | 181 |
| 178 logging.info('Running post merge script %r', post_script) | 182 logging.info('Running post merge script %r', post_script) |
| 179 os.execlp(post_script) | 183 os.execlp(post_script) |
| 180 | 184 |
| 181 main(sys.argv[1:]) | 185 main(sys.argv[1:]) |
| OLD | NEW |