| 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 "runhooks_wrapper.py"), | 72 "runhooks_wrapper.py"), |
| 73 env=env) | 73 env=env) |
| 74 | 74 |
| 75 # generate_build_files step | 75 # generate_build_files step |
| 76 api.chromium.run_mb(api.properties.get('mastername'), | 76 api.chromium.run_mb(api.properties.get('mastername'), |
| 77 api.properties.get('buildername')) | 77 api.properties.get('buildername')) |
| 78 | 78 |
| 79 # cleanup_temp step | 79 # cleanup_temp step |
| 80 api.chromium.cleanup_temp() | 80 api.chromium.cleanup_temp() |
| 81 | 81 |
| 82 # compile.py step | 82 # compile step |
| 83 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 83 api.chromium.compile(['chrome']) |
| 84 api.python("compile", | |
| 85 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 86 args=args) | |
| 87 | 84 |
| 88 # annotated_steps step | 85 # annotated_steps step |
| 89 api.python( | 86 api.python( |
| 90 "annotated_steps", | 87 "annotated_steps", |
| 91 api.path["build"].join("scripts", "slave", "chromium", | 88 api.path["build"].join("scripts", "slave", "chromium", |
| 92 "nacl_sdk_buildbot_run.py"), | 89 "nacl_sdk_buildbot_run.py"), |
| 93 args= | 90 args= |
| 94 ['--build-properties=%s' % api.json.dumps(build_properties, | 91 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 95 separators=(',', ':')), | 92 separators=(',', ':')), |
| 96 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 93 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 "runhooks_wrapper.py"), | 159 "runhooks_wrapper.py"), |
| 163 env=env) | 160 env=env) |
| 164 | 161 |
| 165 # generate_build_files step | 162 # generate_build_files step |
| 166 api.chromium.run_mb(api.properties.get('mastername'), | 163 api.chromium.run_mb(api.properties.get('mastername'), |
| 167 api.properties.get('buildername')) | 164 api.properties.get('buildername')) |
| 168 | 165 |
| 169 # cleanup_temp step | 166 # cleanup_temp step |
| 170 api.chromium.cleanup_temp() | 167 api.chromium.cleanup_temp() |
| 171 | 168 |
| 172 # compile.py step | 169 # compile step |
| 173 args = ['--target', 'Release', '--build-tool=ninja', | 170 api.chromium.compile(['chrome']) |
| 174 '--compiler=goma-clang', '--', 'chrome'] | 171 |
| 175 api.python("compile", | |
| 176 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 177 args=args) | |
| 178 # annotated_steps step | 172 # annotated_steps step |
| 179 api.python( | 173 api.python( |
| 180 "annotated_steps", | 174 "annotated_steps", |
| 181 api.path["build"].join("scripts", "slave", "chromium", | 175 api.path["build"].join("scripts", "slave", "chromium", |
| 182 "nacl_sdk_buildbot_run.py"), | 176 "nacl_sdk_buildbot_run.py"), |
| 183 args= | 177 args= |
| 184 ['--build-properties=%s' % api.json.dumps(build_properties, | 178 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 185 separators=(',', ':')), | 179 separators=(',', ':')), |
| 186 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 180 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| 187 ',"blink_config":"chromium","gclient_env":'+\ | 181 ',"blink_config":"chromium","gclient_env":'+\ |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 "runhooks_wrapper.py"), | 246 "runhooks_wrapper.py"), |
| 253 env=env) | 247 env=env) |
| 254 | 248 |
| 255 # generate_build_files step | 249 # generate_build_files step |
| 256 api.chromium.run_mb(api.properties.get('mastername'), | 250 api.chromium.run_mb(api.properties.get('mastername'), |
| 257 api.properties.get('buildername')) | 251 api.properties.get('buildername')) |
| 258 | 252 |
| 259 # cleanup_temp step | 253 # cleanup_temp step |
| 260 api.chromium.cleanup_temp() | 254 api.chromium.cleanup_temp() |
| 261 | 255 |
| 262 # compile.py step | 256 # compile step |
| 263 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 257 api.chromium.compile(['chrome']) |
| 264 api.python("compile", | 258 |
| 265 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 266 args=args) | |
| 267 # annotated_steps step | 259 # annotated_steps step |
| 268 api.python( | 260 api.python( |
| 269 "annotated_steps", | 261 "annotated_steps", |
| 270 api.path["build"].join("scripts", "slave", "chromium", | 262 api.path["build"].join("scripts", "slave", "chromium", |
| 271 "nacl_sdk_buildbot_run.py"), | 263 "nacl_sdk_buildbot_run.py"), |
| 272 args= | 264 args= |
| 273 ['--build-properties=%s' % api.json.dumps(build_properties, | 265 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 274 separators=(',', ':')), | 266 separators=(',', ':')), |
| 275 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 267 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| 276 ',"blink_config":"chromium","gclient_env":'+\ | 268 ',"blink_config":"chromium","gclient_env":'+\ |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 "runhooks_wrapper.py"), | 308 "runhooks_wrapper.py"), |
| 317 env=env) | 309 env=env) |
| 318 | 310 |
| 319 # generate_build_files step | 311 # generate_build_files step |
| 320 api.chromium.run_mb(api.properties.get('mastername'), | 312 api.chromium.run_mb(api.properties.get('mastername'), |
| 321 api.properties.get('buildername')) | 313 api.properties.get('buildername')) |
| 322 | 314 |
| 323 # cleanup_temp step | 315 # cleanup_temp step |
| 324 api.chromium.cleanup_temp() | 316 api.chromium.cleanup_temp() |
| 325 | 317 |
| 326 # compile.py step | 318 # compile step |
| 327 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 319 api.chromium.compile(['chrome']) |
| 328 api.python("compile", | 320 |
| 329 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 330 args=args) | |
| 331 # annotated_steps step | 321 # annotated_steps step |
| 332 api.python( | 322 api.python( |
| 333 "annotated_steps", | 323 "annotated_steps", |
| 334 api.path["build"].join("scripts", "slave", "chromium", | 324 api.path["build"].join("scripts", "slave", "chromium", |
| 335 "nacl_sdk_buildbot_run.py"), | 325 "nacl_sdk_buildbot_run.py"), |
| 336 args= | 326 args= |
| 337 ['--build-properties=%s' % api.json.dumps(build_properties, | 327 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 338 separators=(',', ':')), | 328 separators=(',', ':')), |
| 339 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 329 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| 340 ',"blink_config":"chromium","gclient_env":'+\ | 330 ',"blink_config":"chromium","gclient_env":'+\ |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 "runhooks_wrapper.py"), | 372 "runhooks_wrapper.py"), |
| 383 env=env) | 373 env=env) |
| 384 | 374 |
| 385 # generate_build_files step | 375 # generate_build_files step |
| 386 api.chromium.run_mb(api.properties.get('mastername'), | 376 api.chromium.run_mb(api.properties.get('mastername'), |
| 387 api.properties.get('buildername')) | 377 api.properties.get('buildername')) |
| 388 | 378 |
| 389 # cleanup_temp step | 379 # cleanup_temp step |
| 390 api.chromium.cleanup_temp() | 380 api.chromium.cleanup_temp() |
| 391 | 381 |
| 392 # compile.py step | 382 # compile step |
| 393 args = ['--target', 'Release', '--compiler=goma', 'chrome',] | 383 api.chromium.compile(['chrome']) |
| 394 api.python("compile", | 384 |
| 395 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 396 args=args) | |
| 397 # annotated_steps step | 385 # annotated_steps step |
| 398 api.python( | 386 api.python( |
| 399 "annotated_steps", | 387 "annotated_steps", |
| 400 api.path["build"].join("scripts", "slave", "chromium", | 388 api.path["build"].join("scripts", "slave", "chromium", |
| 401 "nacl_sdk_buildbot_run.py"), | 389 "nacl_sdk_buildbot_run.py"), |
| 402 args= | 390 args= |
| 403 ['--build-properties=%s' % api.json.dumps(build_properties, | 391 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 404 separators=(',', ':')), | 392 separators=(',', ':')), |
| 405 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 393 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| 406 ',"blink_config":"chromium","gclient_env":'+\ | 394 ',"blink_config":"chromium","gclient_env":'+\ |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 "runhooks_wrapper.py"), | 435 "runhooks_wrapper.py"), |
| 448 env=env) | 436 env=env) |
| 449 | 437 |
| 450 # generate_build_files step | 438 # generate_build_files step |
| 451 api.chromium.run_mb(api.properties.get('mastername'), | 439 api.chromium.run_mb(api.properties.get('mastername'), |
| 452 api.properties.get('buildername')) | 440 api.properties.get('buildername')) |
| 453 | 441 |
| 454 # cleanup_temp step | 442 # cleanup_temp step |
| 455 api.chromium.cleanup_temp() | 443 api.chromium.cleanup_temp() |
| 456 | 444 |
| 457 # compile.py step | 445 # compile step |
| 458 args = ['--target', 'Release', '--build-tool=ninja', | 446 api.chromium.compile(['chrome']) |
| 459 '--compiler=goma-clang', '--', 'chrome'] | 447 |
| 460 api.python("compile", | |
| 461 api.path["build"].join("scripts", "slave", "compile.py"), | |
| 462 args=args) | |
| 463 # annotated_steps step | 448 # annotated_steps step |
| 464 api.python( | 449 api.python( |
| 465 "annotated_steps", | 450 "annotated_steps", |
| 466 api.path["build"].join("scripts", "slave", "chromium", | 451 api.path["build"].join("scripts", "slave", "chromium", |
| 467 "nacl_sdk_buildbot_run.py"), | 452 "nacl_sdk_buildbot_run.py"), |
| 468 args= | 453 args= |
| 469 ['--build-properties=%s' % api.json.dumps(build_properties, | 454 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 470 separators=(',', ':')), | 455 separators=(',', ':')), |
| 471 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 456 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ |
| 472 ',"blink_config":"chromium","gclient_env":'+\ | 457 ',"blink_config":"chromium","gclient_env":'+\ |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 537 yield (api.test('mac_sdk_multirel') + api.properties( | 522 yield (api.test('mac_sdk_multirel') + api.properties( |
| 538 mastername='client.nacl.sdk') + api.properties( | 523 mastername='client.nacl.sdk') + api.properties( |
| 539 buildername='mac-sdk-multirel') + | 524 buildername='mac-sdk-multirel') + |
| 540 api.properties(revision='123456789abcdef') + api.properties( | 525 api.properties(revision='123456789abcdef') + api.properties( |
| 541 got_revision='123456789abcdef') + api.properties( | 526 got_revision='123456789abcdef') + api.properties( |
| 542 buildnumber='42') + api.properties(slavename='TestSlave')) | 527 buildnumber='42') + api.properties(slavename='TestSlave')) |
| 543 yield (api.test('builder_not_in_dispatch_directory') + api.properties( | 528 yield (api.test('builder_not_in_dispatch_directory') + api.properties( |
| 544 mastername='client.nacl.sdk') + api.properties( | 529 mastername='client.nacl.sdk') + api.properties( |
| 545 buildername='nonexistent_builder') + api.properties( | 530 buildername='nonexistent_builder') + api.properties( |
| 546 slavename='TestSlave')) | 531 slavename='TestSlave')) |
| OLD | NEW |