Title: [91323] trunk/Tools
- Revision
- 91323
- Author
- [email protected]
- Date
- 2011-07-19 17:29:20 -0700 (Tue, 19 Jul 2011)
Log Message
parse-malloc-history always exits 1, causing NRWT to fail
https://bugs.webkit.org/show_bug.cgi?id=64835
Reviewed by Adam Barth.
ORWT just never checked the return code. :)
* Scripts/parse-malloc-history:
(main):
* Scripts/webkitpy/layout_tests/port/mac.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91322 => 91323)
--- trunk/Tools/ChangeLog 2011-07-20 00:07:39 UTC (rev 91322)
+++ trunk/Tools/ChangeLog 2011-07-20 00:29:20 UTC (rev 91323)
@@ -1,3 +1,16 @@
+2011-07-19 Eric Seidel <[email protected]>
+
+ parse-malloc-history always exits 1, causing NRWT to fail
+ https://bugs.webkit.org/show_bug.cgi?id=64835
+
+ Reviewed by Adam Barth.
+
+ ORWT just never checked the return code. :)
+
+ * Scripts/parse-malloc-history:
+ (main):
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+
2011-07-19 Kevin Ollivier <[email protected]>
[wx] Unreviewed build fix, don't add the debug prefix as 2.9 no longer uses one.
Modified: trunk/Tools/Scripts/parse-malloc-history (91322 => 91323)
--- trunk/Tools/Scripts/parse-malloc-history 2011-07-20 00:07:39 UTC (rev 91322)
+++ trunk/Tools/Scripts/parse-malloc-history 2011-07-20 00:29:20 UTC (rev 91323)
@@ -163,6 +163,7 @@
}
print "total: " . commify($byteCountTotalReported) . " bytes (" . commify($byteCountTotal - $byteCountTotalReported) . " bytes excluded).\n";
+ return 0;
}
exit(main());
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (91322 => 91323)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-20 00:07:39 UTC (rev 91322)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2011-07-20 00:29:20 UTC (rev 91323)
@@ -109,7 +109,11 @@
'--merge-depth',
merge_depth,
] + leak_files
- parse_malloc_history_output = self._port._run_script("parse-malloc-history", args, include_configuration_arguments=False)
+ try:
+ parse_malloc_history_output = self._port._run_script("parse-malloc-history", args, include_configuration_arguments=False)
+ except ScriptError, e:
+ _log.warn("Failed to parse leaks output: %s" % e.message_with_output())
+ return
unique_leak_count = len(re.findall(r'^(\d*)\scalls', parse_malloc_history_output))
total_bytes = int(re.search(r'^total\:\s(.*)\s\(', parse_malloc_history_output).group(1))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
