[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[mrowe at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit dcebfca2fac630a826ab77ec832d25c7aa466317
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 30 05:21:23 2010 +0000

    Fix run-leaks with newer versions of the leaks tool.
    
    Rubber-stamped by Stephanie Lewis.
    
    * Scripts/run-leaks:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54099 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3cbe938..cba480d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-29  Mark Rowe  <mrowe at apple.com>
+
+        Rubber-stamped by Stephanie Lewis.
+
+        Fix run-leaks with newer versions of the leaks tool.
+
+        * Scripts/run-leaks:
+
 2010-01-29  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Eric Siedel.
diff --git a/WebKitTools/Scripts/run-leaks b/WebKitTools/Scripts/run-leaks
index d8f89d3..9dc58de 100755
--- a/WebKitTools/Scripts/run-leaks
+++ b/WebKitTools/Scripts/run-leaks
@@ -132,6 +132,15 @@ sub parseLeaksOutput(\@)
     #
     #   We treat every line except for  Process 00000: and Leak: as optional
 
+    # Newer versions of the leaks output have a header section at the top, with the first line describing the version of the output format.
+    # If we detect the new format is being used then we eat all of the header section so the output matches the format of older versions.
+    # FIXME: In the future we may wish to propagate this section through to our output.
+    if ($leaksOutput->[0] =~ /^leaks Report Version:/) {
+        while ($leaksOutput->[0] !~ /^Process /) {
+            shift @$leaksOutput;
+        }
+    }
+
     my ($leakCount) = ($leaksOutput->[1] =~ /[[:blank:]]+([0-9]+)[[:blank:]]+leaks?/);
     if (!defined($leakCount)) {
         reportError("Could not parse leak count reported by leaks tool.");

-- 
WebKit Debian packaging