[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 00b3dd15e0030026845625f4d398744f5420c443
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 18:34:06 2010 +0000

    Only print the interesting text from VC++ Express build logs
    
    Fixes <http://webkit.org/b/49325> It's hard to find the interesting
    output from print-vse-failure-logs
    
    Reviewed by Eric Seidel.
    
    * Scripts/print-vse-failure-logs: Removed unnecessary os.path import,
    added newly-required imports. Removed a comment that was essentially a
    FIXME, and is now fixed.
    (PrintVisualStudioExpressLogs._relevant_text): Added. Uses
    BeautifulSoup to extract the relevant text from the build log.
    (PrintVisualStudioExpressLogs.main): Only print the relevant text.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71751 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 81ce5fa..3fe546c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2010-11-10  Adam Roben  <aroben at apple.com>
+
+        Only print the interesting text from VC++ Express build logs
+
+        Fixes <http://webkit.org/b/49325> It's hard to find the interesting
+        output from print-vse-failure-logs
+
+        Reviewed by Eric Seidel.
+
+        * Scripts/print-vse-failure-logs: Removed unnecessary os.path import,
+        added newly-required imports. Removed a comment that was essentially a
+        FIXME, and is now fixed.
+        (PrintVisualStudioExpressLogs._relevant_text): Added. Uses
+        BeautifulSoup to extract the relevant text from the build log.
+        (PrintVisualStudioExpressLogs.main): Only print the relevant text.
+
 2010-11-09  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/Scripts/print-vse-failure-logs b/WebKitTools/Scripts/print-vse-failure-logs
index cec806e..21647fd 100755
--- a/WebKitTools/Scripts/print-vse-failure-logs
+++ b/WebKitTools/Scripts/print-vse-failure-logs
@@ -33,15 +33,13 @@
 from __future__ import with_statement
 
 import codecs
-import os.path
 import os
+import re
 
 from webkitpy.common.system.executive import Executive
+from webkitpy.thirdparty import BeautifulSoup
 
 
-# This is just enough to make the win-ews bot useable.  Others who
-# actually use Windows should feel encouraged to improve this class,
-# including just printing the text instead of the raw html.
 class PrintVisualStudioExpressLogs(object):
     def __init__(self):
         self._executive = Executive()
@@ -64,6 +62,16 @@ class PrintVisualStudioExpressLogs(object):
         build_directory = self._executive.run_command([build_directory_script_path, "--top-level"]).rstrip()
         return os.path.join(build_directory, "obj")
 
+    def _relevant_text(self, log):
+        soup = BeautifulSoup.BeautifulSoup(log)
+        # The Output Window table is where the useful output starts in the build log.
+        output_window_table = soup.find(text=re.compile("Output Window")).findParent("table")
+        result = []
+        for table in [output_window_table] + output_window_table.findNextSiblings("table"):
+            result.extend([text.replace("&nbsp;", "") for text in table.findAll(text=True)])
+            result.append("\n")
+        return "".join(result)
+
     def main(self):
         obj_directory = self._obj_directory()
         build_log_paths = self._find_buildlogs(obj_directory)
@@ -73,7 +81,7 @@ class PrintVisualStudioExpressLogs(object):
         for build_log_path in build_log_paths:
             print "%s:\n" % build_log_path
             with codecs.open(build_log_path, "r", "utf-16") as build_log:
-                print build_log.read()
+                print self._relevant_text(build_log)
 
 
 if __name__ == '__main__':

-- 
WebKit Debian packaging