Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(160)

Side by Side Diff: scripts/slave/recipes/client.drmemory.recipe_autogen.py

Issue 2319853002: Remove ignored bot_update "force" parameter. (Closed)
Patch Set: rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 'gsutil', 10 'gsutil',
(...skipping 11 matching lines...) Expand all
22 # checkout DrMemory step 22 # checkout DrMemory step
23 src_cfg = api.gclient.make_config() 23 src_cfg = api.gclient.make_config()
24 soln = src_cfg.solutions.add() 24 soln = src_cfg.solutions.add()
25 soln.name = "drmemory" 25 soln.name = "drmemory"
26 soln.url = "https://github.com/DynamoRIO/drmemory.git" 26 soln.url = "https://github.com/DynamoRIO/drmemory.git"
27 soln.custom_deps = {"drmemory/dynamorio": 27 soln.custom_deps = {"drmemory/dynamorio":
28 "https://github.com/DynamoRIO/dynamorio.git", 28 "https://github.com/DynamoRIO/dynamorio.git",
29 "tools/buildbot": 29 "tools/buildbot":
30 "https://github.com/DynamoRIO/buildbot.git"} 30 "https://github.com/DynamoRIO/buildbot.git"}
31 api.gclient.c = src_cfg 31 api.gclient.c = src_cfg
32 result = api.bot_update.ensure_checkout(force=True) 32 result = api.bot_update.ensure_checkout()
33 build_properties.update(result.json.output.get("properties", {})) 33 build_properties.update(result.json.output.get("properties", {}))
34 # get buildnumber step; no longer needed 34 # get buildnumber step; no longer needed
35 # Package DrMemory step 35 # Package DrMemory step
36 api.step("Package Dr. Memory", 36 api.step("Package Dr. Memory",
37 ["ctest", "-VV", "-S", 37 ["ctest", "-VV", "-S",
38 str(api.path["checkout"].join("package.cmake")) + ",build=0x" + 38 str(api.path["checkout"].join("package.cmake")) + ",build=0x" +
39 build_properties["got_revision"][:7] + ";drmem_only"]) 39 build_properties["got_revision"][:7] + ";drmem_only"])
40 # find package file step; no longer necessary 40 # find package file step; no longer necessary
41 # upload drmemory build step 41 # upload drmemory build step
42 api.gsutil.upload("DrMemory-Linux-*" + build_properties["got_revision"][ 42 api.gsutil.upload("DrMemory-Linux-*" + build_properties["got_revision"][
43 :7] + ".tar.gz", "chromium-drmemory-builds", "builds/") 43 :7] + ".tar.gz", "chromium-drmemory-builds", "builds/")
44 44
45 45
46 def linux_lucid_x64_drm_steps(api): 46 def linux_lucid_x64_drm_steps(api):
47 build_properties = api.properties.legacy() 47 build_properties = api.properties.legacy()
48 # checkout DrMemory step 48 # checkout DrMemory step
49 src_cfg = api.gclient.make_config() 49 src_cfg = api.gclient.make_config()
50 soln = src_cfg.solutions.add() 50 soln = src_cfg.solutions.add()
51 soln.name = "drmemory" 51 soln.name = "drmemory"
52 soln.url = "https://github.com/DynamoRIO/drmemory.git" 52 soln.url = "https://github.com/DynamoRIO/drmemory.git"
53 soln.custom_deps = {"drmemory/dynamorio": 53 soln.custom_deps = {"drmemory/dynamorio":
54 "https://github.com/DynamoRIO/dynamorio.git", 54 "https://github.com/DynamoRIO/dynamorio.git",
55 "tools/buildbot": 55 "tools/buildbot":
56 "https://github.com/DynamoRIO/buildbot.git"} 56 "https://github.com/DynamoRIO/buildbot.git"}
57 api.gclient.c = src_cfg 57 api.gclient.c = src_cfg
58 result = api.bot_update.ensure_checkout(force=True) 58 result = api.bot_update.ensure_checkout()
59 build_properties.update(result.json.output.get("properties", {})) 59 build_properties.update(result.json.output.get("properties", {}))
60 # Dr. Memory ctest step 60 # Dr. Memory ctest step
61 api.step( 61 api.step(
62 "Dr. Memory ctest", 62 "Dr. Memory ctest",
63 ["ctest", "--timeout", "60", "-VV", "-S", 63 ["ctest", "--timeout", "60", "-VV", "-S",
64 str(api.path["checkout"].join("tests", "runsuite.cmake")) + 64 str(api.path["checkout"].join("tests", "runsuite.cmake")) +
65 ",drmemory_only;long;build=0x" + build_properties["got_revision"][:7] 65 ",drmemory_only;long;build=0x" + build_properties["got_revision"][:7]
66 ]) 66 ])
67 # Prepare to pack test results step; null converted 67 # Prepare to pack test results step; null converted
68 # Pack test results step 68 # Pack test results step
(...skipping 21 matching lines...) Expand all
90 # checkout DrMemory step 90 # checkout DrMemory step
91 src_cfg = api.gclient.make_config() 91 src_cfg = api.gclient.make_config()
92 soln = src_cfg.solutions.add() 92 soln = src_cfg.solutions.add()
93 soln.name = "drmemory" 93 soln.name = "drmemory"
94 soln.url = "https://github.com/DynamoRIO/drmemory.git" 94 soln.url = "https://github.com/DynamoRIO/drmemory.git"
95 soln.custom_deps = {"drmemory/dynamorio": 95 soln.custom_deps = {"drmemory/dynamorio":
96 "https://github.com/DynamoRIO/dynamorio.git", 96 "https://github.com/DynamoRIO/dynamorio.git",
97 "tools/buildbot": 97 "tools/buildbot":
98 "https://github.com/DynamoRIO/buildbot.git"} 98 "https://github.com/DynamoRIO/buildbot.git"}
99 api.gclient.c = src_cfg 99 api.gclient.c = src_cfg
100 result = api.bot_update.ensure_checkout(force=True) 100 result = api.bot_update.ensure_checkout()
101 build_properties.update(result.json.output.get("properties", {})) 101 build_properties.update(result.json.output.get("properties", {}))
102 # clear tools directory step; null converted 102 # clear tools directory step; null converted
103 # update tools step; null converted 103 # update tools step; null converted
104 # unpack tools step; generic ShellCommand converted 104 # unpack tools step; generic ShellCommand converted
105 api.step("unpack tools", 105 api.step("unpack tools",
106 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools', 106 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools',
107 'unpack.bat')], 107 'unpack.bat')],
108 env={}, 108 env={},
109 cwd=api.path[ 109 cwd=api.path[
110 "slave_build"].join('tools', 'buildbot', 'bot_tools')) 110 "slave_build"].join('tools', 'buildbot', 'bot_tools'))
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 234
235 def mac_mavericks_x64_DR_steps(api): 235 def mac_mavericks_x64_DR_steps(api):
236 build_properties = api.properties.legacy() 236 build_properties = api.properties.legacy()
237 # checkout DynamiRIO step 237 # checkout DynamiRIO step
238 src_cfg = api.gclient.make_config() 238 src_cfg = api.gclient.make_config()
239 soln = src_cfg.solutions.add() 239 soln = src_cfg.solutions.add()
240 soln.name = "dynamorio" 240 soln.name = "dynamorio"
241 soln.url = "https://github.com/DynamoRIO/dynamorio.git" 241 soln.url = "https://github.com/DynamoRIO/dynamorio.git"
242 api.gclient.c = src_cfg 242 api.gclient.c = src_cfg
243 result = api.bot_update.ensure_checkout(force=True) 243 result = api.bot_update.ensure_checkout()
244 build_properties.update(result.json.output.get("properties", {})) 244 build_properties.update(result.json.output.get("properties", {}))
245 # pre-commit suite step 245 # pre-commit suite step
246 api.step("pre-commit suite", 246 api.step("pre-commit suite",
247 ['ctest', '--timeout', '120', '-VV', '-S', api.path[ 247 ['ctest', '--timeout', '120', '-VV', '-S', api.path[
248 "checkout"].join("suite", "runsuite.cmake")], 248 "checkout"].join("suite", "runsuite.cmake")],
249 cwd=api.path["slave_build"], 249 cwd=api.path["slave_build"],
250 ok_ret="all") 250 ok_ret="all")
251 251
252 252
253 def linux_cr_builder_steps(api): 253 def linux_cr_builder_steps(api):
(...skipping 11 matching lines...) Expand all
265 'http://src.chromium.org/native_client/trunk', 265 'http://src.chromium.org/native_client/trunk',
266 'sourceforge_url': 266 'sourceforge_url':
267 'https://svn.code.sf.net/p/%(repo)s/code', 267 'https://svn.code.sf.net/p/%(repo)s/code',
268 'llvm_url': 'http://llvm.org/svn/llvm-project'} 268 'llvm_url': 'http://llvm.org/svn/llvm-project'}
269 src_cfg.got_revision_mapping.update( 269 src_cfg.got_revision_mapping.update(
270 {'src': 'got_revision', 270 {'src': 'got_revision',
271 'src/third_party/WebKit': 'got_webkit_revision', 271 'src/third_party/WebKit': 'got_webkit_revision',
272 'src/tools/swarming_client': 'got_swarming_client_revision', 272 'src/tools/swarming_client': 'got_swarming_client_revision',
273 'src/v8': 'got_v8_revision'}) 273 'src/v8': 'got_v8_revision'})
274 api.gclient.c = src_cfg 274 api.gclient.c = src_cfg
275 result = api.bot_update.ensure_checkout(force=True) 275 result = api.bot_update.ensure_checkout()
276 build_properties.update(result.json.output.get("properties", {})) 276 build_properties.update(result.json.output.get("properties", {}))
277 277
278 # clobber before runhooks 278 # clobber before runhooks
279 if 'clobber' in api.properties: 279 if 'clobber' in api.properties:
280 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release')) 280 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Release'))
281 281
282 # gclient revert step; made unnecessary by bot_update 282 # gclient revert step; made unnecessary by bot_update
283 # gclient update step; made unnecessary by bot_update 283 # gclient update step; made unnecessary by bot_update
284 # gclient runhooks wrapper step 284 # gclient runhooks wrapper step
285 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 285 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
(...skipping 19 matching lines...) Expand all
305 305
306 306
307 def mac_builder_DR_steps(api): 307 def mac_builder_DR_steps(api):
308 build_properties = api.properties.legacy() 308 build_properties = api.properties.legacy()
309 # checkout DynamiRIO step 309 # checkout DynamiRIO step
310 src_cfg = api.gclient.make_config() 310 src_cfg = api.gclient.make_config()
311 soln = src_cfg.solutions.add() 311 soln = src_cfg.solutions.add()
312 soln.name = "dynamorio" 312 soln.name = "dynamorio"
313 soln.url = "https://github.com/DynamoRIO/dynamorio.git" 313 soln.url = "https://github.com/DynamoRIO/dynamorio.git"
314 api.gclient.c = src_cfg 314 api.gclient.c = src_cfg
315 result = api.bot_update.ensure_checkout(force=True) 315 result = api.bot_update.ensure_checkout()
316 build_properties.update(result.json.output.get("properties", {})) 316 build_properties.update(result.json.output.get("properties", {}))
317 # get buildnumber step; no longer needed 317 # get buildnumber step; no longer needed
318 # Package DynamoRIO step 318 # Package DynamoRIO step
319 api.step("Package DynamoRIO", 319 api.step("Package DynamoRIO",
320 ["ctest", "-VV", "-S", 320 ["ctest", "-VV", "-S",
321 str(api.path["checkout"].join("make", "package.cmake")) + 321 str(api.path["checkout"].join("make", "package.cmake")) +
322 ",build=0x" + build_properties["revision"][:7]]) 322 ",build=0x" + build_properties["revision"][:7]])
323 # find package file step; no longer necessary 323 # find package file step; no longer necessary
324 # upload dynamorio package 324 # upload dynamorio package
325 api.gsutil.upload("DynamoRIO-MacOS-*" + build_properties["got_revision"][ 325 api.gsutil.upload("DynamoRIO-MacOS-*" + build_properties["got_revision"][
326 :7] + ".tar.gz", "chromium-dynamorio", "builds/") 326 :7] + ".tar.gz", "chromium-dynamorio", "builds/")
327 327
328 328
329 def win_xp_drm_steps(api): 329 def win_xp_drm_steps(api):
330 build_properties = api.properties.legacy() 330 build_properties = api.properties.legacy()
331 # checkout DrMemory step 331 # checkout DrMemory step
332 src_cfg = api.gclient.make_config() 332 src_cfg = api.gclient.make_config()
333 soln = src_cfg.solutions.add() 333 soln = src_cfg.solutions.add()
334 soln.name = "drmemory" 334 soln.name = "drmemory"
335 soln.url = "https://github.com/DynamoRIO/drmemory.git" 335 soln.url = "https://github.com/DynamoRIO/drmemory.git"
336 soln.custom_deps = {"drmemory/dynamorio": 336 soln.custom_deps = {"drmemory/dynamorio":
337 "https://github.com/DynamoRIO/dynamorio.git", 337 "https://github.com/DynamoRIO/dynamorio.git",
338 "tools/buildbot": 338 "tools/buildbot":
339 "https://github.com/DynamoRIO/buildbot.git"} 339 "https://github.com/DynamoRIO/buildbot.git"}
340 api.gclient.c = src_cfg 340 api.gclient.c = src_cfg
341 result = api.bot_update.ensure_checkout(force=True) 341 result = api.bot_update.ensure_checkout()
342 build_properties.update(result.json.output.get("properties", {})) 342 build_properties.update(result.json.output.get("properties", {}))
343 # clear tools directory step; null converted 343 # clear tools directory step; null converted
344 # update tools step; null converted 344 # update tools step; null converted
345 # unpack tools step; generic ShellCommand converted 345 # unpack tools step; generic ShellCommand converted
346 api.step("unpack tools", 346 api.step("unpack tools",
347 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools', 347 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools',
348 'unpack.bat')], 348 'unpack.bat')],
349 env={}, 349 env={},
350 cwd=api.path[ 350 cwd=api.path[
351 "slave_build"].join('tools', 'buildbot', 'bot_tools')) 351 "slave_build"].join('tools', 'buildbot', 'bot_tools'))
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 # checkout DrMemory step 478 # checkout DrMemory step
479 src_cfg = api.gclient.make_config() 479 src_cfg = api.gclient.make_config()
480 soln = src_cfg.solutions.add() 480 soln = src_cfg.solutions.add()
481 soln.name = "drmemory" 481 soln.name = "drmemory"
482 soln.url = "https://github.com/DynamoRIO/drmemory.git" 482 soln.url = "https://github.com/DynamoRIO/drmemory.git"
483 soln.custom_deps = {"drmemory/dynamorio": 483 soln.custom_deps = {"drmemory/dynamorio":
484 "https://github.com/DynamoRIO/dynamorio.git", 484 "https://github.com/DynamoRIO/dynamorio.git",
485 "tools/buildbot": 485 "tools/buildbot":
486 "https://github.com/DynamoRIO/buildbot.git"} 486 "https://github.com/DynamoRIO/buildbot.git"}
487 api.gclient.c = src_cfg 487 api.gclient.c = src_cfg
488 result = api.bot_update.ensure_checkout(force=True) 488 result = api.bot_update.ensure_checkout()
489 build_properties.update(result.json.output.get("properties", {})) 489 build_properties.update(result.json.output.get("properties", {}))
490 # Dr. Memory ctest step 490 # Dr. Memory ctest step
491 api.step( 491 api.step(
492 "Dr. Memory ctest", 492 "Dr. Memory ctest",
493 ["ctest", "--timeout", "60", "-VV", "-S", 493 ["ctest", "--timeout", "60", "-VV", "-S",
494 str(api.path["checkout"].join("tests", "runsuite.cmake")) + 494 str(api.path["checkout"].join("tests", "runsuite.cmake")) +
495 ",drmemory_only;long;build=0x" + build_properties["got_revision"][:7] 495 ",drmemory_only;long;build=0x" + build_properties["got_revision"][:7]
496 ]) 496 ])
497 # Prepare to pack test results step; null converted 497 # Prepare to pack test results step; null converted
498 # Pack test results step 498 # Pack test results step
(...skipping 13 matching lines...) Expand all
512 512
513 513
514 def linux_cr_steps(api): 514 def linux_cr_steps(api):
515 build_properties = api.properties.legacy() 515 build_properties = api.properties.legacy()
516 # checkout DynamiRIO step 516 # checkout DynamiRIO step
517 src_cfg = api.gclient.make_config() 517 src_cfg = api.gclient.make_config()
518 soln = src_cfg.solutions.add() 518 soln = src_cfg.solutions.add()
519 soln.name = "dynamorio" 519 soln.name = "dynamorio"
520 soln.url = "https://github.com/DynamoRIO/dynamorio.git" 520 soln.url = "https://github.com/DynamoRIO/dynamorio.git"
521 api.gclient.c = src_cfg 521 api.gclient.c = src_cfg
522 result = api.bot_update.ensure_checkout(force=True) 522 result = api.bot_update.ensure_checkout()
523 build_properties.update(result.json.output.get("properties", {})) 523 build_properties.update(result.json.output.get("properties", {}))
524 # Make the build directory step 524 # Make the build directory step
525 api.file.makedirs("makedirs", api.path["slave_build"].join("dynamorio")) 525 api.file.makedirs("makedirs", api.path["slave_build"].join("dynamorio"))
526 api.file.makedirs("makedirs", api.path["slave_build"].join("dynamorio", 526 api.file.makedirs("makedirs", api.path["slave_build"].join("dynamorio",
527 "build")) 527 "build"))
528 # Configure release DynamoRIO step; generic ShellCommand converted 528 # Configure release DynamoRIO step; generic ShellCommand converted
529 api.step("Configure release DynamoRIO", 529 api.step("Configure release DynamoRIO",
530 [ 530 [
531 'cmake', '..', '-DDEBUG=OFF' 531 'cmake', '..', '-DDEBUG=OFF'
532 ], 532 ],
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 'http://src.chromium.org/native_client/trunk', 670 'http://src.chromium.org/native_client/trunk',
671 'sourceforge_url': 671 'sourceforge_url':
672 'https://svn.code.sf.net/p/%(repo)s/code', 672 'https://svn.code.sf.net/p/%(repo)s/code',
673 'llvm_url': 'http://llvm.org/svn/llvm-project'} 673 'llvm_url': 'http://llvm.org/svn/llvm-project'}
674 src_cfg.got_revision_mapping.update( 674 src_cfg.got_revision_mapping.update(
675 {'src': 'got_revision', 675 {'src': 'got_revision',
676 'src/third_party/WebKit': 'got_webkit_revision', 676 'src/third_party/WebKit': 'got_webkit_revision',
677 'src/tools/swarming_client': 'got_swarming_client_revision', 677 'src/tools/swarming_client': 'got_swarming_client_revision',
678 'src/v8': 'got_v8_revision'}) 678 'src/v8': 'got_v8_revision'})
679 api.gclient.c = src_cfg 679 api.gclient.c = src_cfg
680 result = api.bot_update.ensure_checkout(force=True) 680 result = api.bot_update.ensure_checkout()
681 build_properties.update(result.json.output.get("properties", {})) 681 build_properties.update(result.json.output.get("properties", {}))
682 682
683 # clobber before runhooks 683 # clobber before runhooks
684 if 'clobber' in api.properties: 684 if 'clobber' in api.properties:
685 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug')) 685 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug'))
686 686
687 # gclient revert step; made unnecessary by bot_update 687 # gclient revert step; made unnecessary by bot_update
688 # gclient update step; made unnecessary by bot_update 688 # gclient update step; made unnecessary by bot_update
689 # gclient runhooks wrapper step 689 # gclient runhooks wrapper step
690 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 690 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
896 # checkout DrMemory step 896 # checkout DrMemory step
897 src_cfg = api.gclient.make_config() 897 src_cfg = api.gclient.make_config()
898 soln = src_cfg.solutions.add() 898 soln = src_cfg.solutions.add()
899 soln.name = "drmemory" 899 soln.name = "drmemory"
900 soln.url = "https://github.com/DynamoRIO/drmemory.git" 900 soln.url = "https://github.com/DynamoRIO/drmemory.git"
901 soln.custom_deps = {"drmemory/dynamorio": 901 soln.custom_deps = {"drmemory/dynamorio":
902 "https://github.com/DynamoRIO/dynamorio.git", 902 "https://github.com/DynamoRIO/dynamorio.git",
903 "tools/buildbot": 903 "tools/buildbot":
904 "https://github.com/DynamoRIO/buildbot.git"} 904 "https://github.com/DynamoRIO/buildbot.git"}
905 api.gclient.c = src_cfg 905 api.gclient.c = src_cfg
906 result = api.bot_update.ensure_checkout(force=True) 906 result = api.bot_update.ensure_checkout()
907 build_properties.update(result.json.output.get("properties", {})) 907 build_properties.update(result.json.output.get("properties", {}))
908 # clear tools directory step; null converted 908 # clear tools directory step; null converted
909 # update tools step; null converted 909 # update tools step; null converted
910 # unpack tools step; generic ShellCommand converted 910 # unpack tools step; generic ShellCommand converted
911 api.step("unpack tools", 911 api.step("unpack tools",
912 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools', 912 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools',
913 'unpack.bat')], 913 'unpack.bat')],
914 env={}, 914 env={},
915 cwd=api.path[ 915 cwd=api.path[
916 "slave_build"].join('tools', 'buildbot', 'bot_tools')) 916 "slave_build"].join('tools', 'buildbot', 'bot_tools'))
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1057 'http://src.chromium.org/native_client/trunk', 1057 'http://src.chromium.org/native_client/trunk',
1058 'sourceforge_url': 1058 'sourceforge_url':
1059 'https://svn.code.sf.net/p/%(repo)s/code', 1059 'https://svn.code.sf.net/p/%(repo)s/code',
1060 'llvm_url': 'http://llvm.org/svn/llvm-project'} 1060 'llvm_url': 'http://llvm.org/svn/llvm-project'}
1061 src_cfg.got_revision_mapping.update( 1061 src_cfg.got_revision_mapping.update(
1062 {'src': 'got_revision', 1062 {'src': 'got_revision',
1063 'src/third_party/WebKit': 'got_webkit_revision', 1063 'src/third_party/WebKit': 'got_webkit_revision',
1064 'src/tools/swarming_client': 'got_swarming_client_revision', 1064 'src/tools/swarming_client': 'got_swarming_client_revision',
1065 'src/v8': 'got_v8_revision'}) 1065 'src/v8': 'got_v8_revision'})
1066 api.gclient.c = src_cfg 1066 api.gclient.c = src_cfg
1067 result = api.bot_update.ensure_checkout(force=True) 1067 result = api.bot_update.ensure_checkout()
1068 build_properties.update(result.json.output.get("properties", {})) 1068 build_properties.update(result.json.output.get("properties", {}))
1069 1069
1070 # clobber before runhooks 1070 # clobber before runhooks
1071 if 'clobber' in api.properties: 1071 if 'clobber' in api.properties:
1072 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug')) 1072 api.file.rmtree('clobber', api.path['checkout'].join('out', 'Debug'))
1073 1073
1074 # gclient revert step; made unnecessary by bot_update 1074 # gclient revert step; made unnecessary by bot_update
1075 # gclient update step; made unnecessary by bot_update 1075 # gclient update step; made unnecessary by bot_update
1076 # gclient runhooks wrapper step 1076 # gclient runhooks wrapper step
1077 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1', 1077 env = {'CHROMIUM_GYP_SYNTAX_CHECK': '1',
(...skipping 17 matching lines...) Expand all
1095 # checkout DrMemory step 1095 # checkout DrMemory step
1096 src_cfg = api.gclient.make_config() 1096 src_cfg = api.gclient.make_config()
1097 soln = src_cfg.solutions.add() 1097 soln = src_cfg.solutions.add()
1098 soln.name = "drmemory" 1098 soln.name = "drmemory"
1099 soln.url = "https://github.com/DynamoRIO/drmemory.git" 1099 soln.url = "https://github.com/DynamoRIO/drmemory.git"
1100 soln.custom_deps = {"drmemory/dynamorio": 1100 soln.custom_deps = {"drmemory/dynamorio":
1101 "https://github.com/DynamoRIO/dynamorio.git", 1101 "https://github.com/DynamoRIO/dynamorio.git",
1102 "tools/buildbot": 1102 "tools/buildbot":
1103 "https://github.com/DynamoRIO/buildbot.git"} 1103 "https://github.com/DynamoRIO/buildbot.git"}
1104 api.gclient.c = src_cfg 1104 api.gclient.c = src_cfg
1105 result = api.bot_update.ensure_checkout(force=True) 1105 result = api.bot_update.ensure_checkout()
1106 build_properties.update(result.json.output.get("properties", {})) 1106 build_properties.update(result.json.output.get("properties", {}))
1107 # clear tools directory step; null converted 1107 # clear tools directory step; null converted
1108 # update tools step; null converted 1108 # update tools step; null converted
1109 # unpack tools step; generic ShellCommand converted 1109 # unpack tools step; generic ShellCommand converted
1110 api.step("unpack tools", 1110 api.step("unpack tools",
1111 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools', 1111 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools',
1112 'unpack.bat')], 1112 'unpack.bat')],
1113 env={}, 1113 env={},
1114 cwd=api.path[ 1114 cwd=api.path[
1115 "slave_build"].join('tools', 'buildbot', 'bot_tools')) 1115 "slave_build"].join('tools', 'buildbot', 'bot_tools'))
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 # checkout DrMemory step 1242 # checkout DrMemory step
1243 src_cfg = api.gclient.make_config() 1243 src_cfg = api.gclient.make_config()
1244 soln = src_cfg.solutions.add() 1244 soln = src_cfg.solutions.add()
1245 soln.name = "drmemory" 1245 soln.name = "drmemory"
1246 soln.url = "https://github.com/DynamoRIO/drmemory.git" 1246 soln.url = "https://github.com/DynamoRIO/drmemory.git"
1247 soln.custom_deps = {"drmemory/dynamorio": 1247 soln.custom_deps = {"drmemory/dynamorio":
1248 "https://github.com/DynamoRIO/dynamorio.git", 1248 "https://github.com/DynamoRIO/dynamorio.git",
1249 "tools/buildbot": 1249 "tools/buildbot":
1250 "https://github.com/DynamoRIO/buildbot.git"} 1250 "https://github.com/DynamoRIO/buildbot.git"}
1251 api.gclient.c = src_cfg 1251 api.gclient.c = src_cfg
1252 result = api.bot_update.ensure_checkout(force=True) 1252 result = api.bot_update.ensure_checkout()
1253 build_properties.update(result.json.output.get("properties", {})) 1253 build_properties.update(result.json.output.get("properties", {}))
1254 # get buildnumber step; no longer needed 1254 # get buildnumber step; no longer needed
1255 # Package DrMemory step 1255 # Package DrMemory step
1256 api.step("Package Dr. Memory", 1256 api.step("Package Dr. Memory",
1257 ["ctest", "-VV", "-S", 1257 ["ctest", "-VV", "-S",
1258 str(api.path["checkout"].join("package.cmake")) + ",build=0x" + 1258 str(api.path["checkout"].join("package.cmake")) + ",build=0x" +
1259 build_properties["got_revision"][:7] + ";drmem_only"]) 1259 build_properties["got_revision"][:7] + ";drmem_only"])
1260 # find package file step; no longer necessary 1260 # find package file step; no longer necessary
1261 # upload drmemory build step 1261 # upload drmemory build step
1262 api.gsutil.upload("DrMemory-MacOS-*" + build_properties["got_revision"][ 1262 api.gsutil.upload("DrMemory-MacOS-*" + build_properties["got_revision"][
1263 :7] + ".tar.gz", "chromium-drmemory-builds", "builds/") 1263 :7] + ".tar.gz", "chromium-drmemory-builds", "builds/")
1264 1264
1265 1265
1266 def win_builder_steps(api): 1266 def win_builder_steps(api):
1267 build_properties = api.properties.legacy() 1267 build_properties = api.properties.legacy()
1268 # checkout DrMemory step 1268 # checkout DrMemory step
1269 src_cfg = api.gclient.make_config() 1269 src_cfg = api.gclient.make_config()
1270 soln = src_cfg.solutions.add() 1270 soln = src_cfg.solutions.add()
1271 soln.name = "drmemory" 1271 soln.name = "drmemory"
1272 soln.url = "https://github.com/DynamoRIO/drmemory.git" 1272 soln.url = "https://github.com/DynamoRIO/drmemory.git"
1273 soln.custom_deps = {"drmemory/dynamorio": 1273 soln.custom_deps = {"drmemory/dynamorio":
1274 "https://github.com/DynamoRIO/dynamorio.git", 1274 "https://github.com/DynamoRIO/dynamorio.git",
1275 "tools/buildbot": 1275 "tools/buildbot":
1276 "https://github.com/DynamoRIO/buildbot.git"} 1276 "https://github.com/DynamoRIO/buildbot.git"}
1277 api.gclient.c = src_cfg 1277 api.gclient.c = src_cfg
1278 result = api.bot_update.ensure_checkout(force=True) 1278 result = api.bot_update.ensure_checkout()
1279 build_properties.update(result.json.output.get("properties", {})) 1279 build_properties.update(result.json.output.get("properties", {}))
1280 # clear tools directory step; null converted 1280 # clear tools directory step; null converted
1281 # update tools step; null converted 1281 # update tools step; null converted
1282 # unpack tools step; generic ShellCommand converted 1282 # unpack tools step; generic ShellCommand converted
1283 api.step("unpack tools", 1283 api.step("unpack tools",
1284 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools', 1284 [api.path["slave_build"].join('tools', 'buildbot', 'bot_tools',
1285 'unpack.bat')], 1285 'unpack.bat')],
1286 env={}, 1286 env={},
1287 cwd=api.path[ 1287 cwd=api.path[
1288 "slave_build"].join('tools', 'buildbot', 'bot_tools')) 1288 "slave_build"].join('tools', 'buildbot', 'bot_tools'))
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
1613 stdout=api.raw_io.output("DrMemory-Windows-1.2.3-0x1234567.zip")) 1613 stdout=api.raw_io.output("DrMemory-Windows-1.2.3-0x1234567.zip"))
1614 ) 1614 )
1615 1615
1616 yield (api.test('builder_not_in_dispatch_directory') 1616 yield (api.test('builder_not_in_dispatch_directory')
1617 + api.properties( 1617 + api.properties(
1618 mastername='client.drmemory', 1618 mastername='client.drmemory',
1619 buildername='nonexistent_builder', 1619 buildername='nonexistent_builder',
1620 slavename='TestSlave', 1620 slavename='TestSlave',
1621 ) 1621 )
1622 ) 1622 )
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698