| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 DEPS = [ | 5 DEPS = [ |
| 6 'chromium', | 6 'chromium', |
| 7 'depot_tools/bot_update', | 7 'depot_tools/bot_update', |
| 8 'depot_tools/gclient', | 8 'depot_tools/gclient', |
| 9 'file', | 9 'file', |
| 10 'recipe_engine/json', | 10 'recipe_engine/json', |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 env=env) | 71 env=env) |
| 72 | 72 |
| 73 # generate_build_files step | 73 # generate_build_files step |
| 74 api.chromium.run_mb(api.properties.get('mastername'), | 74 api.chromium.run_mb(api.properties.get('mastername'), |
| 75 api.properties.get('buildername')) | 75 api.properties.get('buildername')) |
| 76 | 76 |
| 77 # cleanup_temp step | 77 # cleanup_temp step |
| 78 api.chromium.cleanup_temp() | 78 api.chromium.cleanup_temp() |
| 79 | 79 |
| 80 # compile.py step | 80 # compile.py step |
| 81 args = ['--target', 'Release', '--compiler=goma', | 81 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 82 'chromium_builder_nacl_sdk'] | |
| 83 api.python("compile", | 82 api.python("compile", |
| 84 api.path["build"].join("scripts", "slave", "compile.py"), | 83 api.path["build"].join("scripts", "slave", "compile.py"), |
| 85 args=args) | 84 args=args) |
| 86 | 85 |
| 87 # annotated_steps step | 86 # annotated_steps step |
| 88 api.python( | 87 api.python( |
| 89 "annotated_steps", | 88 "annotated_steps", |
| 90 api.path["build"].join("scripts", "slave", "chromium", | 89 api.path["build"].join("scripts", "slave", "chromium", |
| 91 "nacl_sdk_buildbot_run.py"), | 90 "nacl_sdk_buildbot_run.py"), |
| 92 args= | 91 args= |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 | 160 |
| 162 # generate_build_files step | 161 # generate_build_files step |
| 163 api.chromium.run_mb(api.properties.get('mastername'), | 162 api.chromium.run_mb(api.properties.get('mastername'), |
| 164 api.properties.get('buildername')) | 163 api.properties.get('buildername')) |
| 165 | 164 |
| 166 # cleanup_temp step | 165 # cleanup_temp step |
| 167 api.chromium.cleanup_temp() | 166 api.chromium.cleanup_temp() |
| 168 | 167 |
| 169 # compile.py step | 168 # compile.py step |
| 170 args = ['--target', 'Release', '--build-tool=ninja', | 169 args = ['--target', 'Release', '--build-tool=ninja', |
| 171 '--compiler=goma-clang', '--', 'chromium_builder_nacl_sdk'] | 170 '--compiler=goma-clang', '--', 'chrome'] |
| 172 api.python("compile", | 171 api.python("compile", |
| 173 api.path["build"].join("scripts", "slave", "compile.py"), | 172 api.path["build"].join("scripts", "slave", "compile.py"), |
| 174 args=args) | 173 args=args) |
| 175 # annotated_steps step | 174 # annotated_steps step |
| 176 api.python( | 175 api.python( |
| 177 "annotated_steps", | 176 "annotated_steps", |
| 178 api.path["build"].join("scripts", "slave", "chromium", | 177 api.path["build"].join("scripts", "slave", "chromium", |
| 179 "nacl_sdk_buildbot_run.py"), | 178 "nacl_sdk_buildbot_run.py"), |
| 180 args= | 179 args= |
| 181 ['--build-properties=%s' % api.json.dumps(build_properties, | 180 ['--build-properties=%s' % api.json.dumps(build_properties, |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 env=env) | 247 env=env) |
| 249 | 248 |
| 250 # generate_build_files step | 249 # generate_build_files step |
| 251 api.chromium.run_mb(api.properties.get('mastername'), | 250 api.chromium.run_mb(api.properties.get('mastername'), |
| 252 api.properties.get('buildername')) | 251 api.properties.get('buildername')) |
| 253 | 252 |
| 254 # cleanup_temp step | 253 # cleanup_temp step |
| 255 api.chromium.cleanup_temp() | 254 api.chromium.cleanup_temp() |
| 256 | 255 |
| 257 # compile.py step | 256 # compile.py step |
| 258 args = ['--target', 'Release', '--compiler=goma', | 257 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 259 'chromium_builder_nacl_sdk'] | |
| 260 api.python("compile", | 258 api.python("compile", |
| 261 api.path["build"].join("scripts", "slave", "compile.py"), | 259 api.path["build"].join("scripts", "slave", "compile.py"), |
| 262 args=args) | 260 args=args) |
| 263 # annotated_steps step | 261 # annotated_steps step |
| 264 api.python( | 262 api.python( |
| 265 "annotated_steps", | 263 "annotated_steps", |
| 266 api.path["build"].join("scripts", "slave", "chromium", | 264 api.path["build"].join("scripts", "slave", "chromium", |
| 267 "nacl_sdk_buildbot_run.py"), | 265 "nacl_sdk_buildbot_run.py"), |
| 268 args= | 266 args= |
| 269 ['--build-properties=%s' % api.json.dumps(build_properties, | 267 ['--build-properties=%s' % api.json.dumps(build_properties, |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 env=env) | 309 env=env) |
| 312 | 310 |
| 313 # generate_build_files step | 311 # generate_build_files step |
| 314 api.chromium.run_mb(api.properties.get('mastername'), | 312 api.chromium.run_mb(api.properties.get('mastername'), |
| 315 api.properties.get('buildername')) | 313 api.properties.get('buildername')) |
| 316 | 314 |
| 317 # cleanup_temp step | 315 # cleanup_temp step |
| 318 api.chromium.cleanup_temp() | 316 api.chromium.cleanup_temp() |
| 319 | 317 |
| 320 # compile.py step | 318 # compile.py step |
| 321 args = ['--target', 'Release', '--compiler=goma', | 319 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 322 'chromium_builder_tests'] | |
| 323 api.python("compile", | 320 api.python("compile", |
| 324 api.path["build"].join("scripts", "slave", "compile.py"), | 321 api.path["build"].join("scripts", "slave", "compile.py"), |
| 325 args=args) | 322 args=args) |
| 326 # annotated_steps step | 323 # annotated_steps step |
| 327 api.python( | 324 api.python( |
| 328 "annotated_steps", | 325 "annotated_steps", |
| 329 api.path["build"].join("scripts", "slave", "chromium", | 326 api.path["build"].join("scripts", "slave", "chromium", |
| 330 "nacl_sdk_buildbot_run.py"), | 327 "nacl_sdk_buildbot_run.py"), |
| 331 args= | 328 args= |
| 332 ['--build-properties=%s' % api.json.dumps(build_properties, | 329 ['--build-properties=%s' % api.json.dumps(build_properties, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 env=env) | 373 env=env) |
| 377 | 374 |
| 378 # generate_build_files step | 375 # generate_build_files step |
| 379 api.chromium.run_mb(api.properties.get('mastername'), | 376 api.chromium.run_mb(api.properties.get('mastername'), |
| 380 api.properties.get('buildername')) | 377 api.properties.get('buildername')) |
| 381 | 378 |
| 382 # cleanup_temp step | 379 # cleanup_temp step |
| 383 api.chromium.cleanup_temp() | 380 api.chromium.cleanup_temp() |
| 384 | 381 |
| 385 # compile.py step | 382 # compile.py step |
| 386 args = ['--target', 'Release', '--compiler=goma', | 383 args = ['--target', 'Release', '--compiler=goma', 'chrome',] |
| 387 'chromium_builder_tests',] | |
| 388 api.python("compile", | 384 api.python("compile", |
| 389 api.path["build"].join("scripts", "slave", "compile.py"), | 385 api.path["build"].join("scripts", "slave", "compile.py"), |
| 390 args=args) | 386 args=args) |
| 391 # annotated_steps step | 387 # annotated_steps step |
| 392 api.python( | 388 api.python( |
| 393 "annotated_steps", | 389 "annotated_steps", |
| 394 api.path["build"].join("scripts", "slave", "chromium", | 390 api.path["build"].join("scripts", "slave", "chromium", |
| 395 "nacl_sdk_buildbot_run.py"), | 391 "nacl_sdk_buildbot_run.py"), |
| 396 args= | 392 args= |
| 397 ['--build-properties=%s' % api.json.dumps(build_properties, | 393 ['--build-properties=%s' % api.json.dumps(build_properties, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 441 | 437 |
| 442 # generate_build_files step | 438 # generate_build_files step |
| 443 api.chromium.run_mb(api.properties.get('mastername'), | 439 api.chromium.run_mb(api.properties.get('mastername'), |
| 444 api.properties.get('buildername')) | 440 api.properties.get('buildername')) |
| 445 | 441 |
| 446 # cleanup_temp step | 442 # cleanup_temp step |
| 447 api.chromium.cleanup_temp() | 443 api.chromium.cleanup_temp() |
| 448 | 444 |
| 449 # compile.py step | 445 # compile.py step |
| 450 args = ['--target', 'Release', '--build-tool=ninja', | 446 args = ['--target', 'Release', '--build-tool=ninja', |
| 451 '--compiler=goma-clang', '--', 'chromium_builder_tests'] | 447 '--compiler=goma-clang', '--', 'chrome'] |
| 452 api.python("compile", | 448 api.python("compile", |
| 453 api.path["build"].join("scripts", "slave", "compile.py"), | 449 api.path["build"].join("scripts", "slave", "compile.py"), |
| 454 args=args) | 450 args=args) |
| 455 # annotated_steps step | 451 # annotated_steps step |
| 456 api.python( | 452 api.python( |
| 457 "annotated_steps", | 453 "annotated_steps", |
| 458 api.path["build"].join("scripts", "slave", "chromium", | 454 api.path["build"].join("scripts", "slave", "chromium", |
| 459 "nacl_sdk_buildbot_run.py"), | 455 "nacl_sdk_buildbot_run.py"), |
| 460 args= | 456 args= |
| 461 ['--build-properties=%s' % api.json.dumps(build_properties, | 457 ['--build-properties=%s' % api.json.dumps(build_properties, |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 yield (api.test('mac_sdk_multirel') + api.properties( | 525 yield (api.test('mac_sdk_multirel') + api.properties( |
| 530 mastername='client.nacl.sdk') + api.properties( | 526 mastername='client.nacl.sdk') + api.properties( |
| 531 buildername='mac-sdk-multirel') + | 527 buildername='mac-sdk-multirel') + |
| 532 api.properties(revision='123456789abcdef') + api.properties( | 528 api.properties(revision='123456789abcdef') + api.properties( |
| 533 got_revision='123456789abcdef') + api.properties( | 529 got_revision='123456789abcdef') + api.properties( |
| 534 buildnumber='42') + api.properties(slavename='TestSlave')) | 530 buildnumber='42') + api.properties(slavename='TestSlave')) |
| 535 yield (api.test('builder_not_in_dispatch_directory') + api.properties( | 531 yield (api.test('builder_not_in_dispatch_directory') + api.properties( |
| 536 mastername='client.nacl.sdk') + api.properties( | 532 mastername='client.nacl.sdk') + api.properties( |
| 537 buildername='nonexistent_builder') + api.properties( | 533 buildername='nonexistent_builder') + api.properties( |
| 538 slavename='TestSlave')) | 534 slavename='TestSlave')) |
| OLD | NEW |