Changeset 51431 in webkit

Timestamp:

Nov 26, 2009 11:54:57 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-26 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

[bzt] Kill WebKitLandingScripts
​https://bugs.webkit.org/show_bug.cgi?id=31904

Step 1: Kill prepare_clean_working_directory and run_webkit_tests.

• Scripts/bugzilla-tool:
• Scripts/modules/buildsteps.py: Added.
• Scripts/modules/commands/download.py:
• Scripts/modules/landingsequence.py:
• Scripts/modules/webkitlandingscripts.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (2 diffs)
• Scripts/modules/buildsteps.py (added)
• Scripts/modules/commands/download.py (modified) (4 diffs)
• Scripts/modules/landingsequence.py (modified) (2 diffs)
• Scripts/modules/webkitlandingscripts.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Kill WebKitLandingScripts
+        https://bugs.webkit.org/show_bug.cgi?id=31904
+
+        Step 1: Kill prepare_clean_working_directory and run_webkit_tests.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/buildsteps.py: Added.
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
 2009-11-26  Zoltan Horvath  <zoltan@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -33 +33 @@
 import os
 
+from modules.buildsteps import BuildSteps
 from modules.commands.download import *
 from modules.commands.queries import *
@@ -47 +48 @@
         self.buildbot = BuildBot()
         self.cached_scm = None
+        self.steps = BuildSteps()
 
     def dry_run_callback(self, option, opt, value, parser):

trunk/WebKitTools/Scripts/modules/commands/download.py

@@ -88 +88 @@
 
     def execute(self, options, args, tool):
-        WebKitApplyingScripts.setup_for_patch_apply(tool.scm(), options)
+        WebKitApplyingScripts.setup_for_patch_apply(tool, options)
         attachment_id = args[0]
         attachment = tool.bugs.fetch_attachment(attachment_id)
@@ -102 +102 @@
 
     def execute(self, options, args, tool):
-        WebKitApplyingScripts.setup_for_patch_apply(tool.scm(), options)
+        WebKitApplyingScripts.setup_for_patch_apply(tool, options)
         bug_id = args[0]
         patches = tool.bugs.fetch_reviewed_patches_from_bug(bug_id)
@@ -117 +117 @@
 
     @staticmethod
-    def setup_for_patch_apply(scm, options):
-        WebKitLandingScripts.prepare_clean_working_directory(scm, options, allow_local_commits=True)
+    def setup_for_patch_apply(tool, options):
+        tool.steps.clean_working_directory(tool.scm(), options, allow_local_commits=True)
         if options.update:
-            scm.update_webkit()
+            tool.scm().update_webkit()
 
     @staticmethod
@@ -393 +393 @@
                 log("Failed to parse bug number from diff.  No bugs will be updated/reopened after the rollout.")
 
-        WebKitLandingScripts.prepare_clean_working_directory(tool.scm(), options)
+        tool.steps.clean_working_directory(tool.scm(), options)
         tool.scm().update_webkit()
         tool.scm().apply_reverse_diff(revision)

trunk/WebKitTools/Scripts/modules/landingsequence.py

@@ -69 +69 @@
 
     def clean(self):
-        WebKitLandingScripts.prepare_clean_working_directory(self._tool.scm(), self._options)
+        self._tool.steps.clean_working_directory(self._tool.scm(), self._options)
 
     def update(self):
@@ -86 +86 @@
     def test(self):
         # When running non-interactively we don't want to launch Safari and we want to exit after the first failure.
-        WebKitLandingScripts.run_webkit_tests(launch_safari=not self._options.non_interactive, fail_fast=self._options.non_interactive, quiet=self._options.quiet, port=self._port)
+        self._tool.run_tests(launch_safari=not self._options.non_interactive, fail_fast=self._options.non_interactive, quiet=self._options.quiet, port=self._port)
 
     def commit(self):

trunk/WebKitTools/Scripts/modules/webkitlandingscripts.py

@@ -130 +130 @@
         error("Builders at %s are red, please do not commit.  Pass --ignore-builders to bypass this check." % (buildbot.buildbot_host))
 
-    @classmethod
-    def run_webkit_tests(cls, launch_safari, fail_fast=False, quiet=False, port=WebKitPort):
-        args = port.run_webkit_tests_command()
-        if not launch_safari:
-            args.append("--no-launch-safari")
-        if quiet:
-            args.append("--quiet")
-        if fail_fast:
-            args.append("--exit-after-n-failures=1")
-        cls.run_and_throw_if_fail(args)
 
-    @staticmethod
-    def prepare_clean_working_directory(scm, options, allow_local_commits=False):
-        os.chdir(scm.checkout_root)
-        if not allow_local_commits:
-            scm.ensure_no_local_commits(options.force_clean)
-        if options.clean:
-            scm.ensure_clean_working_directory(force_clean=options.force_clean)