| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 | 79 |
| 80 # compile.py step | 80 # compile.py step |
| 81 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 81 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 82 api.python("compile", | 82 api.python("compile", |
| 83 api.path["build"].join("scripts", "slave", "compile.py"), | 83 api.path["build"].join("scripts", "slave", "compile.py"), |
| 84 args=args) | 84 args=args) |
| 85 | 85 |
| 86 # annotated_steps step | 86 # annotated_steps step |
| 87 api.python( | 87 api.python( |
| 88 "annotated_steps", | 88 "annotated_steps", |
| 89 api.path["build"].join("scripts", "slave", "chromium", | 89 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 90 "nacl_sdk_buildbot_run.py"), | 90 "buildbot_run.py"), |
| 91 args= | 91 args= |
| 92 ['--build-properties=%s' % api.json.dumps(build_properties, | 92 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 93 separators=(',', ':')), | 93 separators=(',', ':')), |
| 94 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 94 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 95 ',"blink_config":"chromium",'+\ | 95 ',"blink_config":"chromium",'+\ |
| 96 '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\ | 96 '"gclient_env":{"CHROMIUM_GYP_SYNTAX_CHECK":"1",'+\ |
| 97 '"DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":'+\ | 97 '"DEPOT_TOOLS_UPDATE":"0","GYP_DEFINES":'+\ |
| 98 '"fastbuild=1 component=static_library","LANDMINES_VERBOSE":"1"'+\ | 98 '"fastbuild=1 component=static_library","LANDMINES_VERBOSE":"1"'+\ |
| 99 '},"no_gclient_branch":true,"nuke_and_pave":false}' | 99 '},"no_gclient_branch":true,"nuke_and_pave":false}' |
| 100 ], | 100 ], |
| 101 allow_subannotations=True) | 101 allow_subannotations=True) |
| 102 | 102 |
| 103 | 103 |
| 104 def mac_sdk_multi_steps(api): | 104 def mac_sdk_multi_steps(api): |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 | 167 |
| 168 # compile.py step | 168 # compile.py step |
| 169 args = ['--target', 'Release', '--build-tool=ninja', | 169 args = ['--target', 'Release', '--build-tool=ninja', |
| 170 '--compiler=goma-clang', '--', 'chrome'] | 170 '--compiler=goma-clang', '--', 'chrome'] |
| 171 api.python("compile", | 171 api.python("compile", |
| 172 api.path["build"].join("scripts", "slave", "compile.py"), | 172 api.path["build"].join("scripts", "slave", "compile.py"), |
| 173 args=args) | 173 args=args) |
| 174 # annotated_steps step | 174 # annotated_steps step |
| 175 api.python( | 175 api.python( |
| 176 "annotated_steps", | 176 "annotated_steps", |
| 177 api.path["build"].join("scripts", "slave", "chromium", | 177 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 178 "nacl_sdk_buildbot_run.py"), | 178 "buildbot_run.py"), |
| 179 args= | 179 args= |
| 180 ['--build-properties=%s' % api.json.dumps(build_properties, | 180 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 181 separators=(',', ':')), | 181 separators=(',', ':')), |
| 182 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 182 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 183 ',"blink_config":"chromium","gclient_env":'+\ | 183 ',"blink_config":"chromium","gclient_env":'+\ |
| 184 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ | 184 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ |
| 185 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ | 185 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ |
| 186 '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\ | 186 '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\ |
| 187 '"no_gclient_branch":true,"nuke_and_pave":false}' | 187 '"no_gclient_branch":true,"nuke_and_pave":false}' |
| 188 ], | 188 ], |
| 189 allow_subannotations=True) | 189 allow_subannotations=True) |
| 190 | 190 |
| 191 | 191 |
| 192 def windows_sdk_multi_steps(api): | 192 def windows_sdk_multi_steps(api): |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 api.chromium.cleanup_temp() | 254 api.chromium.cleanup_temp() |
| 255 | 255 |
| 256 # compile.py step | 256 # compile.py step |
| 257 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 257 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 258 api.python("compile", | 258 api.python("compile", |
| 259 api.path["build"].join("scripts", "slave", "compile.py"), | 259 api.path["build"].join("scripts", "slave", "compile.py"), |
| 260 args=args) | 260 args=args) |
| 261 # annotated_steps step | 261 # annotated_steps step |
| 262 api.python( | 262 api.python( |
| 263 "annotated_steps", | 263 "annotated_steps", |
| 264 api.path["build"].join("scripts", "slave", "chromium", | 264 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 265 "nacl_sdk_buildbot_run.py"), | 265 "buildbot_run.py"), |
| 266 args= | 266 args= |
| 267 ['--build-properties=%s' % api.json.dumps(build_properties, | 267 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 268 separators=(',', ':')), | 268 separators=(',', ':')), |
| 269 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 269 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 270 ',"blink_config":"chromium","gclient_env":'+\ | 270 ',"blink_config":"chromium","gclient_env":'+\ |
| 271 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ | 271 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ |
| 272 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ | 272 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ |
| 273 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ | 273 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ |
| 274 '"nuke_and_pave":false}' | 274 '"nuke_and_pave":false}' |
| 275 ], | 275 ], |
| 276 allow_subannotations=True) | 276 allow_subannotations=True) |
| 277 | 277 |
| 278 | 278 |
| 279 def linux_sdk_multirel_steps(api): | 279 def linux_sdk_multirel_steps(api): |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 316 api.chromium.cleanup_temp() | 316 api.chromium.cleanup_temp() |
| 317 | 317 |
| 318 # compile.py step | 318 # compile.py step |
| 319 args = ['--target', 'Release', '--compiler=goma', 'chrome'] | 319 args = ['--target', 'Release', '--compiler=goma', 'chrome'] |
| 320 api.python("compile", | 320 api.python("compile", |
| 321 api.path["build"].join("scripts", "slave", "compile.py"), | 321 api.path["build"].join("scripts", "slave", "compile.py"), |
| 322 args=args) | 322 args=args) |
| 323 # annotated_steps step | 323 # annotated_steps step |
| 324 api.python( | 324 api.python( |
| 325 "annotated_steps", | 325 "annotated_steps", |
| 326 api.path["build"].join("scripts", "slave", "chromium", | 326 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 327 "nacl_sdk_buildbot_run.py"), | 327 "buildbot_run.py"), |
| 328 args= | 328 args= |
| 329 ['--build-properties=%s' % api.json.dumps(build_properties, | 329 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 330 separators=(',', ':')), | 330 separators=(',', ':')), |
| 331 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 331 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 332 ',"blink_config":"chromium","gclient_env":'+\ | 332 ',"blink_config":"chromium","gclient_env":'+\ |
| 333 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ | 333 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ |
| 334 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ | 334 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ |
| 335 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ | 335 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ |
| 336 '"nuke_and_pave":true}' | 336 '"nuke_and_pave":true}' |
| 337 ], | 337 ], |
| 338 allow_subannotations=True) | 338 allow_subannotations=True) |
| 339 | 339 |
| 340 | 340 |
| 341 def windows_sdk_multirel_steps(api): | 341 def windows_sdk_multirel_steps(api): |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 api.chromium.cleanup_temp() | 380 api.chromium.cleanup_temp() |
| 381 | 381 |
| 382 # compile.py step | 382 # compile.py step |
| 383 args = ['--target', 'Release', '--compiler=goma', 'chrome',] | 383 args = ['--target', 'Release', '--compiler=goma', 'chrome',] |
| 384 api.python("compile", | 384 api.python("compile", |
| 385 api.path["build"].join("scripts", "slave", "compile.py"), | 385 api.path["build"].join("scripts", "slave", "compile.py"), |
| 386 args=args) | 386 args=args) |
| 387 # annotated_steps step | 387 # annotated_steps step |
| 388 api.python( | 388 api.python( |
| 389 "annotated_steps", | 389 "annotated_steps", |
| 390 api.path["build"].join("scripts", "slave", "chromium", | 390 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 391 "nacl_sdk_buildbot_run.py"), | 391 "buildbot_run.py"), |
| 392 args= | 392 args= |
| 393 ['--build-properties=%s' % api.json.dumps(build_properties, | 393 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 394 separators=(',', ':')), | 394 separators=(',', ':')), |
| 395 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 395 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 396 ',"blink_config":"chromium","gclient_env":'+\ | 396 ',"blink_config":"chromium","gclient_env":'+\ |
| 397 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ | 397 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ |
| 398 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ | 398 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ |
| 399 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ | 399 '"LANDMINES_VERBOSE":"1"},"no_gclient_branch":true,'+\ |
| 400 '"nuke_and_pave":true}' | 400 '"nuke_and_pave":true}' |
| 401 ], | 401 ], |
| 402 allow_subannotations=True) | 402 allow_subannotations=True) |
| 403 | 403 |
| 404 | 404 |
| 405 def mac_sdk_multirel_steps(api): | 405 def mac_sdk_multirel_steps(api): |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 | 444 |
| 445 # compile.py step | 445 # compile.py step |
| 446 args = ['--target', 'Release', '--build-tool=ninja', | 446 args = ['--target', 'Release', '--build-tool=ninja', |
| 447 '--compiler=goma-clang', '--', 'chrome'] | 447 '--compiler=goma-clang', '--', 'chrome'] |
| 448 api.python("compile", | 448 api.python("compile", |
| 449 api.path["build"].join("scripts", "slave", "compile.py"), | 449 api.path["build"].join("scripts", "slave", "compile.py"), |
| 450 args=args) | 450 args=args) |
| 451 # annotated_steps step | 451 # annotated_steps step |
| 452 api.python( | 452 api.python( |
| 453 "annotated_steps", | 453 "annotated_steps", |
| 454 api.path["build"].join("scripts", "slave", "chromium", | 454 api.path['checkout'].join("native_client_sdk", "src", "build_tools", |
| 455 "nacl_sdk_buildbot_run.py"), | 455 "buildbot_run.py"), |
| 456 args= | 456 args= |
| 457 ['--build-properties=%s' % api.json.dumps(build_properties, | 457 ['--build-properties=%s' % api.json.dumps(build_properties, |
| 458 separators=(',', ':')), | 458 separators=(',', ':')), |
| 459 '--factory-properties={"annotated_script":"nacl_sdk_buildbot_run.py"'+\ | 459 '--factory-properties={"annotated_script":"buildbot_run.py"'+\ |
| 460 ',"blink_config":"chromium","gclient_env":'+\ | 460 ',"blink_config":"chromium","gclient_env":'+\ |
| 461 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ | 461 '{"CHROMIUM_GYP_SYNTAX_CHECK":"1","DEPOT_TOOLS_UPDATE":"0",'+\ |
| 462 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ | 462 '"GYP_DEFINES":"fastbuild=1 component=static_library",'+\ |
| 463 '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\ | 463 '"GYP_GENERATORS":"ninja","LANDMINES_VERBOSE":"1"},'+\ |
| 464 '"no_gclient_branch":true,"nuke_and_pave":true}' | 464 '"no_gclient_branch":true,"nuke_and_pave":true}' |
| 465 ], | 465 ], |
| 466 allow_subannotations=True) | 466 allow_subannotations=True) |
| 467 | 467 |
| 468 | 468 |
| 469 dispatch_directory = { | 469 dispatch_directory = { |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 yield (api.test('mac_sdk_multirel') + api.properties( | 525 yield (api.test('mac_sdk_multirel') + api.properties( |
| 526 mastername='client.nacl.sdk') + api.properties( | 526 mastername='client.nacl.sdk') + api.properties( |
| 527 buildername='mac-sdk-multirel') + | 527 buildername='mac-sdk-multirel') + |
| 528 api.properties(revision='123456789abcdef') + api.properties( | 528 api.properties(revision='123456789abcdef') + api.properties( |
| 529 got_revision='123456789abcdef') + api.properties( | 529 got_revision='123456789abcdef') + api.properties( |
| 530 buildnumber='42') + api.properties(slavename='TestSlave')) | 530 buildnumber='42') + api.properties(slavename='TestSlave')) |
| 531 yield (api.test('builder_not_in_dispatch_directory') + api.properties( | 531 yield (api.test('builder_not_in_dispatch_directory') + api.properties( |
| 532 mastername='client.nacl.sdk') + api.properties( | 532 mastername='client.nacl.sdk') + api.properties( |
| 533 buildername='nonexistent_builder') + api.properties( | 533 buildername='nonexistent_builder') + api.properties( |
| 534 slavename='TestSlave')) | 534 slavename='TestSlave')) |
| OLD | NEW |