| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 'src/chrome/test/data/firefox3_profile/searchplugins': | 53 'src/chrome/test/data/firefox3_profile/searchplugins': |
| 54 None, | 54 None, |
| 55 'src/data/autodiscovery': None} | 55 'src/data/autodiscovery': None} |
| 56 soln.custom_vars = {} | 56 soln.custom_vars = {} |
| 57 src_cfg.got_revision_mapping.update( | 57 src_cfg.got_revision_mapping.update( |
| 58 {'src': 'got_revision', | 58 {'src': 'got_revision', |
| 59 'src/third_party/WebKit': 'got_webkit_revision', | 59 'src/third_party/WebKit': 'got_webkit_revision', |
| 60 'src/tools/swarming_client': 'got_swarming_client_revision', | 60 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 61 'src/v8': 'got_v8_revision'}) | 61 'src/v8': 'got_v8_revision'}) |
| 62 api.gclient.c = src_cfg | 62 api.gclient.c = src_cfg |
| 63 result = api.bot_update.ensure_checkout(force=True) | 63 result = api.bot_update.ensure_checkout() |
| 64 build_properties.update(result.json.output.get("properties", {})) | 64 build_properties.update(result.json.output.get("properties", {})) |
| 65 | 65 |
| 66 # clobber before runhooks | 66 # clobber before runhooks |
| 67 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 67 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 68 | 68 |
| 69 # gclient revert step; made unnecessary by bot_update | 69 # gclient revert step; made unnecessary by bot_update |
| 70 # gclient update step; made unnecessary by bot_update | 70 # gclient update step; made unnecessary by bot_update |
| 71 # gclient runhooks wrapper step | 71 # gclient runhooks wrapper step |
| 72 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', | 72 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| 73 'LANDMINES_VERBOSE': '1', | 73 'LANDMINES_VERBOSE': '1', |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 'src/chrome/test/data/firefox3_profile/searchplugins': | 141 'src/chrome/test/data/firefox3_profile/searchplugins': |
| 142 None, | 142 None, |
| 143 'src/data/autodiscovery': None} | 143 'src/data/autodiscovery': None} |
| 144 soln.custom_vars = {} | 144 soln.custom_vars = {} |
| 145 src_cfg.got_revision_mapping.update( | 145 src_cfg.got_revision_mapping.update( |
| 146 {'src': 'got_revision', | 146 {'src': 'got_revision', |
| 147 'src/third_party/WebKit': 'got_webkit_revision', | 147 'src/third_party/WebKit': 'got_webkit_revision', |
| 148 'src/tools/swarming_client': 'got_swarming_client_revision', | 148 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 149 'src/v8': 'got_v8_revision'}) | 149 'src/v8': 'got_v8_revision'}) |
| 150 api.gclient.c = src_cfg | 150 api.gclient.c = src_cfg |
| 151 result = api.bot_update.ensure_checkout(force=True) | 151 result = api.bot_update.ensure_checkout() |
| 152 build_properties.update(result.json.output.get("properties", {})) | 152 build_properties.update(result.json.output.get("properties", {})) |
| 153 | 153 |
| 154 # clobber before runhooks | 154 # clobber before runhooks |
| 155 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 155 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 156 | 156 |
| 157 # gclient revert step; made unnecessary by bot_update | 157 # gclient revert step; made unnecessary by bot_update |
| 158 # gclient update step; made unnecessary by bot_update | 158 # gclient update step; made unnecessary by bot_update |
| 159 # gclient runhooks wrapper step | 159 # gclient runhooks wrapper step |
| 160 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', | 160 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| 161 'GYP_GENERATORS': 'ninja', | 161 'GYP_GENERATORS': 'ninja', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 'src/chrome/test/data/firefox3_profile/searchplugins': | 234 'src/chrome/test/data/firefox3_profile/searchplugins': |
| 235 None, | 235 None, |
| 236 'src/data/autodiscovery': None} | 236 'src/data/autodiscovery': None} |
| 237 soln.custom_vars = {} | 237 soln.custom_vars = {} |
| 238 src_cfg.got_revision_mapping.update( | 238 src_cfg.got_revision_mapping.update( |
| 239 {'src': 'got_revision', | 239 {'src': 'got_revision', |
| 240 'src/third_party/WebKit': 'got_webkit_revision', | 240 'src/third_party/WebKit': 'got_webkit_revision', |
| 241 'src/tools/swarming_client': 'got_swarming_client_revision', | 241 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 242 'src/v8': 'got_v8_revision'}) | 242 'src/v8': 'got_v8_revision'}) |
| 243 api.gclient.c = src_cfg | 243 api.gclient.c = src_cfg |
| 244 result = api.bot_update.ensure_checkout(force=True) | 244 result = api.bot_update.ensure_checkout() |
| 245 build_properties.update(result.json.output.get("properties", {})) | 245 build_properties.update(result.json.output.get("properties", {})) |
| 246 | 246 |
| 247 # clobber before runhooks | 247 # clobber before runhooks |
| 248 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 248 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 249 | 249 |
| 250 # gclient revert step; made unnecessary by bot_update | 250 # gclient revert step; made unnecessary by bot_update |
| 251 # gclient update step; made unnecessary by bot_update | 251 # gclient update step; made unnecessary by bot_update |
| 252 # gclient runhooks wrapper step | 252 # gclient runhooks wrapper step |
| 253 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', | 253 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| 254 'LANDMINES_VERBOSE': '1', | 254 'LANDMINES_VERBOSE': '1', |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', | 297 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', |
| 298 'googlecode_url': 'svn://svn.chromium.org/%s', | 298 'googlecode_url': 'svn://svn.chromium.org/%s', |
| 299 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', | 299 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', |
| 300 'svn_url': 'svn://svn.chromium.org'} | 300 'svn_url': 'svn://svn.chromium.org'} |
| 301 src_cfg.got_revision_mapping.update( | 301 src_cfg.got_revision_mapping.update( |
| 302 {'src': 'got_revision', | 302 {'src': 'got_revision', |
| 303 'src/third_party/WebKit': 'got_webkit_revision', | 303 'src/third_party/WebKit': 'got_webkit_revision', |
| 304 'src/tools/swarming_client': 'got_swarming_client_revision', | 304 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 305 'src/v8': 'got_v8_revision'}) | 305 'src/v8': 'got_v8_revision'}) |
| 306 api.gclient.c = src_cfg | 306 api.gclient.c = src_cfg |
| 307 result = api.bot_update.ensure_checkout(force=True) | 307 result = api.bot_update.ensure_checkout() |
| 308 build_properties.update(result.json.output.get("properties", {})) | 308 build_properties.update(result.json.output.get("properties", {})) |
| 309 | 309 |
| 310 # clobber before runhooks | 310 # clobber before runhooks |
| 311 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 311 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 312 | 312 |
| 313 # unnamed step; null converted | 313 # unnamed step; null converted |
| 314 # gclient runhooks wrapper step | 314 # gclient runhooks wrapper step |
| 315 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', | 315 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| 316 'LANDMINES_VERBOSE': '1', | 316 'LANDMINES_VERBOSE': '1', |
| 317 'DEPOT_TOOLS_UPDATE': '0', | 317 'DEPOT_TOOLS_UPDATE': '0', |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', | 363 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', |
| 364 'googlecode_url': 'svn://svn.chromium.org/%s', | 364 'googlecode_url': 'svn://svn.chromium.org/%s', |
| 365 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', | 365 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', |
| 366 'svn_url': 'svn://svn.chromium.org'} | 366 'svn_url': 'svn://svn.chromium.org'} |
| 367 src_cfg.got_revision_mapping.update( | 367 src_cfg.got_revision_mapping.update( |
| 368 {'src': 'got_revision', | 368 {'src': 'got_revision', |
| 369 'src/third_party/WebKit': 'got_webkit_revision', | 369 'src/third_party/WebKit': 'got_webkit_revision', |
| 370 'src/tools/swarming_client': 'got_swarming_client_revision', | 370 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 371 'src/v8': 'got_v8_revision'}) | 371 'src/v8': 'got_v8_revision'}) |
| 372 api.gclient.c = src_cfg | 372 api.gclient.c = src_cfg |
| 373 result = api.bot_update.ensure_checkout(force=True) | 373 result = api.bot_update.ensure_checkout() |
| 374 build_properties.update(result.json.output.get("properties", {})) | 374 build_properties.update(result.json.output.get("properties", {})) |
| 375 | 375 |
| 376 # clobber before runhooks | 376 # clobber before runhooks |
| 377 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 377 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 378 | 378 |
| 379 # unnamed step; null converted | 379 # unnamed step; null converted |
| 380 # gclient runhooks wrapper step | 380 # gclient runhooks wrapper step |
| 381 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', | 381 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', |
| 382 'LANDMINES_VERBOSE': '1', | 382 'LANDMINES_VERBOSE': '1', |
| 383 'DEPOT_TOOLS_UPDATE': '0', | 383 'DEPOT_TOOLS_UPDATE': '0', |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', | 425 soln.custom_vars = {'webkit_trunk': 'svn://svn.chromium.org/blink/trunk', |
| 426 'googlecode_url': 'svn://svn.chromium.org/%s', | 426 'googlecode_url': 'svn://svn.chromium.org/%s', |
| 427 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', | 427 'sourceforge_url': 'svn://svn.chromium.org/%(repo)s', |
| 428 'svn_url': 'svn://svn.chromium.org'} | 428 'svn_url': 'svn://svn.chromium.org'} |
| 429 src_cfg.got_revision_mapping.update( | 429 src_cfg.got_revision_mapping.update( |
| 430 {'src': 'got_revision', | 430 {'src': 'got_revision', |
| 431 'src/third_party/WebKit': 'got_webkit_revision', | 431 'src/third_party/WebKit': 'got_webkit_revision', |
| 432 'src/tools/swarming_client': 'got_swarming_client_revision', | 432 'src/tools/swarming_client': 'got_swarming_client_revision', |
| 433 'src/v8': 'got_v8_revision'}) | 433 'src/v8': 'got_v8_revision'}) |
| 434 api.gclient.c = src_cfg | 434 api.gclient.c = src_cfg |
| 435 result = api.bot_update.ensure_checkout(force=True) | 435 result = api.bot_update.ensure_checkout() |
| 436 build_properties.update(result.json.output.get("properties", {})) | 436 build_properties.update(result.json.output.get("properties", {})) |
| 437 | 437 |
| 438 # clobber before runhooks | 438 # clobber before runhooks |
| 439 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) | 439 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) |
| 440 | 440 |
| 441 # unnamed step; null converted | 441 # unnamed step; null converted |
| 442 # gclient runhooks wrapper step | 442 # gclient runhooks wrapper step |
| 443 env = {'LANDMINES_VERBOSE': '1', | 443 env = {'LANDMINES_VERBOSE': '1', |
| 444 'GYP_GENERATORS': 'ninja', | 444 'GYP_GENERATORS': 'ninja', |
| 445 'DEPOT_TOOLS_UPDATE': '0', | 445 'DEPOT_TOOLS_UPDATE': '0', |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 yield (api.test('mac_sdk_multirel') + api.properties( | 533 yield (api.test('mac_sdk_multirel') + api.properties( |
| 534 mastername='client.nacl.sdk') + api.properties( | 534 mastername='client.nacl.sdk') + api.properties( |
| 535 buildername='mac-sdk-multirel') + | 535 buildername='mac-sdk-multirel') + |
| 536 api.properties(revision='123456789abcdef') + api.properties( | 536 api.properties(revision='123456789abcdef') + api.properties( |
| 537 got_revision='123456789abcdef') + api.properties( | 537 got_revision='123456789abcdef') + api.properties( |
| 538 buildnumber='42') + api.properties(slavename='TestSlave')) | 538 buildnumber='42') + api.properties(slavename='TestSlave')) |
| 539 yield (api.test('builder_not_in_dispatch_directory') + api.properties( | 539 yield (api.test('builder_not_in_dispatch_directory') + api.properties( |
| 540 mastername='client.nacl.sdk') + api.properties( | 540 mastername='client.nacl.sdk') + api.properties( |
| 541 buildername='nonexistent_builder') + api.properties( | 541 buildername='nonexistent_builder') + api.properties( |
| 542 slavename='TestSlave')) | 542 slavename='TestSlave')) |
| OLD | NEW |