Changeset 82771 in webkit
- Timestamp:
- Apr 2, 2011 5:15:35 AM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r82770 r82771 1 2011-04-02 Patrick Gansterer <paroga@webkit.org> 2 3 Reviewed by Eric Seidel. 4 5 Remove AbstractStep._run_script and move script names to ports.py 6 https://bugs.webkit.org/show_bug.cgi?id=57704 7 8 Replace deprecated _run_script with _tool.executive.run_and_throw_if_fail. 9 10 * Scripts/webkitpy/common/config/ports.py: 11 * Scripts/webkitpy/tool/commands/download_unittest.py: 12 * Scripts/webkitpy/tool/commands/roll_unittest.py: 13 * Scripts/webkitpy/tool/commands/upload_unittest.py: 14 * Scripts/webkitpy/tool/steps/abstractstep.py: 15 * Scripts/webkitpy/tool/steps/checkstyle.py: 16 * Scripts/webkitpy/tool/steps/preparechangelog.py: 17 * Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py: 18 * Scripts/webkitpy/tool/steps/preparechangelogforrevert.py: 19 1 20 2011-04-02 Patrick Gansterer <paroga@webkit.org> 2 21 -
trunk/Tools/Scripts/webkitpy/common/config/ports.py
r82770 r82771 91 91 92 92 @classmethod 93 def check_webkit_style_command(cls): 94 return cls.script_shell_command("check-webkit-style") 95 96 @classmethod 97 def prepare_changelog_command(cls): 98 return cls.script_shell_command("prepare-ChangeLog") 99 100 @classmethod 93 101 def build_webkit_command(cls, build_style=None): 94 102 command = cls.script_shell_command("build-webkit") -
trunk/Tools/Scripts/webkitpy/tool/commands/download_unittest.py
r76926 r82771 124 124 125 125 def test_check_style(self): 126 expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\n Running check-webkit-style\n"126 expected_stderr = "Processing 1 patch from 1 bug.\nUpdating working directory\nProcessing patch 197 from bug 42.\n" 127 127 self.assert_execute_outputs(CheckStyle(), [197], options=self._default_options(), expected_stderr=expected_stderr) 128 128 … … 172 172 173 173 def test_prepare_rollout(self): 174 expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\n Running prepare-ChangeLog\n"174 expected_stderr = "Preparing rollout for bug 42.\nUpdating working directory\n" 175 175 self.assert_execute_outputs(PrepareRollout(), [852, "Reason"], options=self._default_options(), expected_stderr=expected_stderr) 176 176 … … 185 185 cc: MOCK cc 186 186 blocked: 42 187 Running prepare-ChangeLog188 187 MOCK add_patch_to_bug: bug_id=78, description=ROLLOUT of r852, mark_for_review=False, mark_for_commit_queue=True, mark_for_landing=False 189 188 -- Begin comment -- … … 203 202 expected_stderr = """Preparing rollout for bug 42. 204 203 Updating working directory 205 Running prepare-ChangeLog206 204 MOCK: user.open_url: file://... 207 205 Was that diff correct? -
trunk/Tools/Scripts/webkitpy/tool/commands/roll_unittest.py
r76926 r82771 37 37 expected_stderr = """Updating Chromium DEPS to 6764 38 38 MOCK: MockDEPS.write_variable(chromium_rev, 6764) 39 Running prepare-ChangeLog40 39 MOCK: user.open_url: file://... 41 40 Was that diff correct? -
trunk/Tools/Scripts/webkitpy/tool/commands/upload_unittest.py
r80537 r82771 60 60 options.review = True 61 61 options.suggest_reviewers = False 62 expected_stderr = """Running check-webkit-style 63 MOCK: user.open_url: file://... 62 expected_stderr = """MOCK: user.open_url: file://... 64 63 Was that diff correct? 65 64 Obsoleting 2 old patches on bug 42 … … 108 107 options.review = True 109 108 options.suggest_reviewers = False 110 expected_stderr = """Running check-webkit-style 111 MOCK: user.open_url: file://... 109 expected_stderr = """MOCK: user.open_url: file://... 112 110 Was that diff correct? 113 111 Obsoleting 2 old patches on bug 42 -
trunk/Tools/Scripts/webkitpy/tool/steps/abstractstep.py
r80549 r82771 27 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 28 29 from webkitpy.common.system.deprecated_logging import log30 29 from webkitpy.common.system.executive import ScriptError 31 30 from webkitpy.common.config.ports import WebKitPort … … 37 36 self._tool = tool 38 37 self._options = options 39 40 # FIXME: This should use tool.port()41 def _run_script(self, script_name, args=None, quiet=False, port=WebKitPort):42 log("Running %s" % script_name)43 command = port.script_shell_command(script_name)44 if args:45 command.extend(args)46 self._tool.executive.run_and_throw_if_fail(command, quiet)47 38 48 39 def _changed_files(self, state): -
trunk/Tools/Scripts/webkitpy/tool/steps/checkstyle.py
r71142 r82771 57 57 58 58 try: 59 self._ run_script("check-webkit-style", args)59 self._tool.executive.run_and_throw_if_fail(self._tool.port().check_webkit_style_command()) 60 60 except ScriptError, e: 61 61 if self._options.non_interactive: -
trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelog.py
r80549 r82771 62 62 return 63 63 os.chdir(self._tool.scm().checkout_root) 64 args = self._tool.port(). script_shell_command("prepare-ChangeLog")64 args = self._tool.port().prepare_changelog_command() 65 65 if state.get("bug_id"): 66 66 args.append("--bug=%s" % state["bug_id"]) -
trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogfordepsroll.py
r76926 r82771 35 35 class PrepareChangeLogForDEPSRoll(AbstractStep): 36 36 def run(self, state): 37 self._ run_script("prepare-ChangeLog")37 self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command()) 38 38 changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None) 39 39 for changelog_path in changelog_paths: -
trunk/Tools/Scripts/webkitpy/tool/steps/preparechangelogforrevert.py
r76926 r82771 51 51 def run(self, state): 52 52 # This could move to prepare-ChangeLog by adding a --revert= option. 53 self._ run_script("prepare-ChangeLog")53 self._tool.executive.run_and_throw_if_fail(self._tool.port().prepare_changelog_command()) 54 54 changelog_paths = self._tool.checkout().modified_changelogs(git_commit=None) 55 55 bug_url = self._tool.bugs.bug_url_for_bug_id(state["bug_id"]) if state["bug_id"] else None
Note: See TracChangeset
for help on using the changeset viewer.