Changeset 51431 in webkit
- Timestamp:
- Nov 26, 2009 11:54:57 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r51417 r51431 1 2009-11-26 Adam Barth <abarth@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 [bzt] Kill WebKitLandingScripts 6 https://bugs.webkit.org/show_bug.cgi?id=31904 7 8 Step 1: Kill prepare_clean_working_directory and run_webkit_tests. 9 10 * Scripts/bugzilla-tool: 11 * Scripts/modules/buildsteps.py: Added. 12 * Scripts/modules/commands/download.py: 13 * Scripts/modules/landingsequence.py: 14 * Scripts/modules/webkitlandingscripts.py: 15 1 16 2009-11-26 Zoltan Horvath <zoltan@webkit.org> 2 17 -
trunk/WebKitTools/Scripts/bugzilla-tool
r51403 r51431 33 33 import os 34 34 35 from modules.buildsteps import BuildSteps 35 36 from modules.commands.download import * 36 37 from modules.commands.queries import * … … 47 48 self.buildbot = BuildBot() 48 49 self.cached_scm = None 50 self.steps = BuildSteps() 49 51 50 52 def dry_run_callback(self, option, opt, value, parser): -
trunk/WebKitTools/Scripts/modules/commands/download.py
r51403 r51431 88 88 89 89 def execute(self, options, args, tool): 90 WebKitApplyingScripts.setup_for_patch_apply(tool .scm(), options)90 WebKitApplyingScripts.setup_for_patch_apply(tool, options) 91 91 attachment_id = args[0] 92 92 attachment = tool.bugs.fetch_attachment(attachment_id) … … 102 102 103 103 def execute(self, options, args, tool): 104 WebKitApplyingScripts.setup_for_patch_apply(tool .scm(), options)104 WebKitApplyingScripts.setup_for_patch_apply(tool, options) 105 105 bug_id = args[0] 106 106 patches = tool.bugs.fetch_reviewed_patches_from_bug(bug_id) … … 117 117 118 118 @staticmethod 119 def setup_for_patch_apply( scm, options):120 WebKitLandingScripts.prepare_clean_working_directory(scm, options, allow_local_commits=True)119 def setup_for_patch_apply(tool, options): 120 tool.steps.clean_working_directory(tool.scm(), options, allow_local_commits=True) 121 121 if options.update: 122 scm.update_webkit()122 tool.scm().update_webkit() 123 123 124 124 @staticmethod … … 393 393 log("Failed to parse bug number from diff. No bugs will be updated/reopened after the rollout.") 394 394 395 WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)395 tool.steps.clean_working_directory(tool.scm(), options) 396 396 tool.scm().update_webkit() 397 397 tool.scm().apply_reverse_diff(revision) -
trunk/WebKitTools/Scripts/modules/landingsequence.py
r51260 r51431 69 69 70 70 def clean(self): 71 WebKitLandingScripts.prepare_clean_working_directory(self._tool.scm(), self._options)71 self._tool.steps.clean_working_directory(self._tool.scm(), self._options) 72 72 73 73 def update(self): … … 86 86 def test(self): 87 87 # When running non-interactively we don't want to launch Safari and we want to exit after the first failure. 88 WebKitLandingScripts.run_webkit_tests(launch_safari=not self._options.non_interactive, fail_fast=self._options.non_interactive, quiet=self._options.quiet, port=self._port)88 self._tool.run_tests(launch_safari=not self._options.non_interactive, fail_fast=self._options.non_interactive, quiet=self._options.quiet, port=self._port) 89 89 90 90 def commit(self): -
trunk/WebKitTools/Scripts/modules/webkitlandingscripts.py
r51260 r51431 130 130 error("Builders at %s are red, please do not commit. Pass --ignore-builders to bypass this check." % (buildbot.buildbot_host)) 131 131 132 @classmethod133 def run_webkit_tests(cls, launch_safari, fail_fast=False, quiet=False, port=WebKitPort):134 args = port.run_webkit_tests_command()135 if not launch_safari:136 args.append("--no-launch-safari")137 if quiet:138 args.append("--quiet")139 if fail_fast:140 args.append("--exit-after-n-failures=1")141 cls.run_and_throw_if_fail(args)142 132 143 @staticmethod144 def prepare_clean_working_directory(scm, options, allow_local_commits=False):145 os.chdir(scm.checkout_root)146 if not allow_local_commits:147 scm.ensure_no_local_commits(options.force_clean)148 if options.clean:149 scm.ensure_clean_working_directory(force_clean=options.force_clean)
Note: See TracChangeset
for help on using the changeset viewer.