OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2013 The Chromium Authors. All rights reserved. | 2 # Copyright 2013 The Chromium Authors. All rights reserved. |
3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
5 | 5 |
6 import os | 6 import os |
| 7 import json |
7 import sys | 8 import sys |
8 | 9 |
9 import bb_utils | 10 import bb_utils |
10 import bb_annotations | 11 import bb_annotations |
11 | 12 |
12 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) | 13 sys.path.append(os.path.join(os.path.dirname(__file__), '..')) |
13 from pylib import constants | 14 from pylib import constants |
14 | 15 |
15 | 16 |
16 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') | 17 SLAVE_SCRIPTS_DIR = os.path.join(bb_utils.BB_BUILD_DIR, 'scripts', 'slave') |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 + bb_utils.EncodeProperties(options), cwd=DIR_BUILD_ROOT) | 79 + bb_utils.EncodeProperties(options), cwd=DIR_BUILD_ROOT) |
79 | 80 |
80 | 81 |
81 def BisectPerfRegression(options): | 82 def BisectPerfRegression(options): |
82 args = [] | 83 args = [] |
83 if options.extra_src: | 84 if options.extra_src: |
84 args = ['--extra_src', options.extra_src] | 85 args = ['--extra_src', options.extra_src] |
85 RunCmd([SrcPath('tools', 'prepare-bisect-perf-regression.py'), | 86 RunCmd([SrcPath('tools', 'prepare-bisect-perf-regression.py'), |
86 '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)]) | 87 '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)]) |
87 RunCmd([SrcPath('tools', 'run-bisect-perf-regression.py'), | 88 RunCmd([SrcPath('tools', 'run-bisect-perf-regression.py'), |
88 '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir)] + args) | 89 '-w', os.path.join(constants.DIR_SOURCE_ROOT, os.pardir), |
| 90 '--build-properties=%s' % json.dumps(options.build_properties)] + |
| 91 args) |
89 | 92 |
90 | 93 |
91 def GetHostStepCmds(): | 94 def GetHostStepCmds(): |
92 return [ | 95 return [ |
93 ('compile', Compile), | 96 ('compile', Compile), |
94 ('extract_build', ExtractBuild), | 97 ('extract_build', ExtractBuild), |
95 ('check_webview_licenses', CheckWebViewLicenses), | 98 ('check_webview_licenses', CheckWebViewLicenses), |
96 ('bisect_perf_regression', BisectPerfRegression), | 99 ('bisect_perf_regression', BisectPerfRegression), |
97 ('zip_build', ZipBuild) | 100 ('zip_build', ZipBuild) |
98 ] | 101 ] |
(...skipping 22 matching lines...) Expand all Loading... |
121 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) | 124 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) |
122 setattr(options, 'extra_src', | 125 setattr(options, 'extra_src', |
123 options.factory_properties.get('extra_src', '')) | 126 options.factory_properties.get('extra_src', '')) |
124 | 127 |
125 if options.steps: | 128 if options.steps: |
126 bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options) | 129 bb_utils.RunSteps(options.steps.split(','), GetHostStepCmds(), options) |
127 | 130 |
128 | 131 |
129 if __name__ == '__main__': | 132 if __name__ == '__main__': |
130 sys.exit(main(sys.argv)) | 133 sys.exit(main(sys.argv)) |
OLD | NEW |