Changeset 51435 in webkit

Timestamp:

Nov 26, 2009 11:56:51 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 5: Kill run_and_throw_if_fail.

• Scripts/modules/buildsteps.py:
• Scripts/modules/processutils.py: Added.
• Scripts/modules/webkitlandingscripts.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/buildsteps.py (modified) (4 diffs)
• Scripts/modules/commands/queues.py (modified) (2 diffs)
• Scripts/modules/processutils.py (added)
• 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 5: Kill run_and_throw_if_fail.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/processutils.py: Added.
+        * Scripts/modules/webkitlandingscripts.py:
+
 2009-11-26  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/buildsteps.py

@@ -30 +30 @@
 
 from modules.logging import log, error
+from modules.processutils import run_and_throw_if_fail
 from modules.webkitlandingscripts import WebKitLandingScripts
 from modules.webkitport import WebKitPort
@@ -36 +37 @@
     def _run_script(cls, script_name, quiet=False, port=WebKitPort):
         log("Running %s" % script_name)
-        WebKitLandingScripts.run_and_throw_if_fail(port.script_path(script_name), quiet)
+        run_and_throw_if_fail(port.script_path(script_name), quiet)
 
     def prepare_changelog(self):
@@ -56 +57 @@
         if fail_fast:
             args.append("--exit-after-n-failures=1")
-        WebKitLandingScripts.run_and_throw_if_fail(args)
+        run_and_throw_if_fail(args)
 
     def ensure_builders_are_green(self, buildbot, options):
@@ -65 +66 @@
     def build_webkit(self, quiet=False, port=WebKitPort):
         log("Building WebKit")
-        WebKitLandingScripts.run_and_throw_if_fail(port.build_webkit_command(), quiet)
+        run_and_throw_if_fail(port.build_webkit_command(), quiet)
 
     def check_style(self):

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

@@ -49 +49 @@
 from modules.multicommandtool import MultiCommandTool, Command
 from modules.patchcollection import PatchCollection
+from modules.processutils import run_and_throw_if_fail
 from modules.scm import CommitMessage, detect_scm_system, ScriptError, CheckoutNeedsUpdate
 from modules.statusbot import StatusBot
-from modules.webkitlandingscripts import WebKitLandingScripts, commit_message_for_this_commit
 from modules.webkitport import WebKitPort
 from modules.workqueue import WorkQueue, WorkQueueDelegate
@@ -97 +97 @@
     def run_bugzilla_tool(self, args):
         bugzilla_tool_args = [self.tool.path()] + args
-        WebKitLandingScripts.run_and_throw_if_fail(bugzilla_tool_args)
+        run_and_throw_if_fail(bugzilla_tool_args)
 
     def log_progress(self, patch_ids):

trunk/WebKitTools/Scripts/modules/webkitlandingscripts.py

@@ -85 +85 @@
         ]
 
-    @staticmethod
-    def run_command_with_teed_output(args, teed_output):
-        child_process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
-        # Use our own custom wait loop because Popen ignores a tee'd stderr/stdout.
-        # FIXME: This could be improved not to flatten output to stdout.
-        while True:
-            output_line = child_process.stdout.readline()
-            if output_line == "" and child_process.poll() != None:
-                return child_process.poll()
-            teed_output.write(output_line)
-
-    @staticmethod
-    def run_and_throw_if_fail(args, quiet=False):
-        # Cache the child's output locally so it can be used for error reports.
-        child_out_file = StringIO.StringIO()
-        if quiet:
-            dev_null = open(os.devnull, "w")
-        child_stdout = tee(child_out_file, dev_null if quiet else sys.stdout)
-        exit_code = WebKitLandingScripts.run_command_with_teed_output(args, child_stdout)
-        if quiet:
-            dev_null.close()
-
-        child_output = child_out_file.getvalue()
-        child_out_file.close()
-
-        if exit_code:
-            raise ScriptError(script_args=args, exit_code=exit_code, output=child_output)