Changeset 100174 in webkit

Timestamp:

Nov 14, 2011, 12:08:53 PM (15 years ago)

Author:

ddkilzer@apple.com

Message:

run-leaks does not work on Lion?
<​http://webkit.org/b/71059>
<rdar://problem/10428527>

Reviewed by Adam Roben.

The output of leaks(1) changed again in Lion to move the
"leaks Report Version: 2.0" line from the first line of the
output to just above the "Process " lines that run-leaks is
interested in parsing. This required using a more generic
algorithm to find the start of the "Process " lines.

• Scripts/run-leaks:

(parseLeaksOutput): Make the code to skip headers more generic.

• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v1.0.pl: Added.
• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-new.pl: Added.
• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-old.pl: Added.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-leaks (modified) (1 diff)
• Scripts/webkitperl/run-leaks_unittest (added)
• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v1.0.pl (added)
• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-new.pl (added)
• Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-old.pl (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-14  David Kilzer  <ddkilzer@apple.com>
+
+        run-leaks does not work on Lion?
+        <http://webkit.org/b/71059>
+        <rdar://problem/10428527>
+
+        Reviewed by Adam Roben.
+
+        The output of leaks(1) changed again in Lion to move the
+        "leaks Report Version: 2.0" line from the first line of the
+        output to just above the "Process " lines that run-leaks is
+        interested in parsing.  This required using a more generic
+        algorithm to find the start of the "Process " lines.
+
+        * Scripts/run-leaks:
+        (parseLeaksOutput): Make the code to skip headers more generic.
+        * Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v1.0.pl: Added.
+        * Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-new.pl: Added.
+        * Scripts/webkitperl/run-leaks_unittest/run-leaks-report-v2.0-old.pl: Added.
+
 2011-11-14  Lei Zhang  <thestig@chromium.org>
 

trunk/Tools/Scripts/run-leaks

@@ -133 +133 @@
     #   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;
-        }
+    # Skip header section until the first two "Process " lines.
+    # FIXME: In the future we may wish to propagate the header section through to our output.
+    until ($leaksOutput->[0] =~ /^Process /) {
+        shift @$leaksOutput;
     }