OLD | NEW |
---|---|
1 # | 1 # |
2 # Copyright 2015 Google Inc. | 2 # Copyright 2015 Google Inc. |
3 # | 3 # |
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 | 7 |
8 #!/usr/bin/env python | 8 #!/usr/bin/env python |
9 | 9 |
10 usage = ''' | 10 usage = ''' |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
155 def get_extra_env_vars(builder_dict): | 155 def get_extra_env_vars(builder_dict): |
156 env = {} | 156 env = {} |
157 if builder_dict.get('configuration') == 'Coverage': | 157 if builder_dict.get('configuration') == 'Coverage': |
158 # We have to use Clang 3.6 because earlier versions do not support the | 158 # We have to use Clang 3.6 because earlier versions do not support the |
159 # compile flags we use and 3.7 and 3.8 hit asserts during compilation. | 159 # compile flags we use and 3.7 and 3.8 hit asserts during compilation. |
160 env['CC'] = '/usr/bin/clang-3.6' | 160 env['CC'] = '/usr/bin/clang-3.6' |
161 env['CXX'] = '/usr/bin/clang++-3.6' | 161 env['CXX'] = '/usr/bin/clang++-3.6' |
162 elif builder_dict.get('compiler') == 'Clang': | 162 elif builder_dict.get('compiler') == 'Clang': |
163 env['CC'] = '/usr/bin/clang' | 163 env['CC'] = '/usr/bin/clang' |
164 env['CXX'] = '/usr/bin/clang++' | 164 env['CXX'] = '/usr/bin/clang++' |
165 | |
166 if builder_dict.get('extra_config') == 'Appurify': | |
mtklein
2015/08/24 15:31:42
Note why?
borenet
2015/08/24 16:47:39
Done.
| |
167 env['BUILDTYPE'] = CONFIG_DEBUG | |
168 | |
165 return env | 169 return env |
166 | 170 |
167 | 171 |
168 cov_skip.extend([lineno(), lineno() + 1]) | 172 cov_skip.extend([lineno(), lineno() + 1]) |
169 def build_targets_from_builder_dict(builder_dict): | 173 def build_targets_from_builder_dict(builder_dict): |
170 """Return a list of targets to build, depending on the builder type.""" | 174 """Return a list of targets to build, depending on the builder type.""" |
171 if builder_dict['role'] in ('Test', 'Perf') and builder_dict['os'] == 'iOS': | 175 if builder_dict['role'] in ('Test', 'Perf') and builder_dict['os'] == 'iOS': |
172 return ['iOSShell'] | 176 return ['iOSShell'] |
173 elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_TEST: | 177 elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_TEST: |
174 t = ['dm'] | 178 t = ['dm'] |
175 if builder_dict.get('configuration') == 'Debug': | 179 if builder_dict.get('configuration') == 'Debug': |
176 t.append('nanobench') | 180 t.append('nanobench') |
177 return t | 181 return t |
178 elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_PERF: | 182 elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_PERF: |
179 return ['nanobench'] | 183 if 'Appurify' in builder_dict.get('extra_config', ''): |
mtklein
2015/08/24 15:31:42
Is there a practical difference between
if builde
borenet
2015/08/24 16:47:39
No, not really. This is just how I happened to co
mtklein
2015/08/24 17:35:33
Let's change one or the other so it's consistent?
borenet
2015/08/24 18:31:48
No more subtlety.
| |
184 return ['VisualBenchTest_APK'] | |
185 else: | |
186 return ['nanobench'] | |
180 else: | 187 else: |
181 return ['most'] | 188 return ['most'] |
182 | 189 |
183 | 190 |
184 cov_skip.extend([lineno(), lineno() + 1]) | 191 cov_skip.extend([lineno(), lineno() + 1]) |
185 def device_cfg(builder_dict): | 192 def device_cfg(builder_dict): |
186 # Android. | 193 # Android. |
187 if 'Android' in builder_dict.get('extra_config', ''): | 194 if 'Android' in builder_dict.get('extra_config', ''): |
188 if 'NoNeon' in builder_dict['extra_config']: | 195 if 'NoNeon' in builder_dict['extra_config']: |
189 return 'arm_v7' | 196 return 'arm_v7' |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
293 'Build-Win-MSVC-x86-Debug', | 300 'Build-Win-MSVC-x86-Debug', |
294 'Build-Win-MSVC-x86-Debug-GDI', | 301 'Build-Win-MSVC-x86-Debug-GDI', |
295 'Build-Win-MSVC-x86-Debug-Exceptions', | 302 'Build-Win-MSVC-x86-Debug-Exceptions', |
296 'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs', | 303 'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs', |
297 'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon', | 304 'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon', |
298 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy', | 305 'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy', |
299 'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link', | 306 'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link', |
300 'Build-Ubuntu-GCC-x86_64-Release-Mesa', | 307 'Build-Ubuntu-GCC-x86_64-Release-Mesa', |
301 'Housekeeper-PerCommit', | 308 'Housekeeper-PerCommit', |
302 'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot', | 309 'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot', |
310 'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify', | |
303 'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug', | 311 'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug', |
304 'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug', | 312 'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug', |
305 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug', | 313 'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug', |
306 'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release', | 314 'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release', |
315 'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage', | |
307 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD', | 316 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD', |
308 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', | 317 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Shared', |
309 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', | 318 'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind', |
310 'Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86-Release-ANGLE', | 319 'Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86-Release-ANGLE', |
311 'Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug', | 320 'Test-Win8-MSVC-ShuttleA-CPU-AVX-x86_64-Debug', |
312 ] | 321 ] |
313 | 322 |
314 cov = coverage.coverage() | 323 cov = coverage.coverage() |
315 cov.start() | 324 cov.start() |
316 for case in cases: | 325 for case in cases: |
(...skipping 17 matching lines...) Expand all Loading... | |
334 if len(sys.argv) == 2 and sys.argv[1] == 'test': | 343 if len(sys.argv) == 2 and sys.argv[1] == 'test': |
335 self_test() | 344 self_test() |
336 sys.exit(0) | 345 sys.exit(0) |
337 | 346 |
338 if len(sys.argv) != 3: | 347 if len(sys.argv) != 3: |
339 print usage | 348 print usage |
340 sys.exit(1) | 349 sys.exit(1) |
341 | 350 |
342 with open(sys.argv[1], 'w') as out: | 351 with open(sys.argv[1], 'w') as out: |
343 json.dump(get_builder_spec(sys.argv[2]), out) | 352 json.dump(get_builder_spec(sys.argv[2]), out) |
OLD | NEW |