Changeset 154387 in webkit

Timestamp:

Aug 21, 2013 9:11:10 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Suppress irrelevant or known leaks for Valgrind
​https://bugs.webkit.org/show_bug.cgi?id=119448

Patch by Brian Holt <​brian.holt@samsung.com> on 2013-08-21
Reviewed by Martin Robinson.

Add a suppressions file to suppress known leaks for Valgrind.
Valgrind also takes longer when using suppressions and
times out unless the driver timeout is increased.

• Scripts/valgrind/suppressions.txt: Added.
• Scripts/webkitpy/port/gtk.py:

(GtkPort.driver_stop_timeout):
(GtkPort.setup_environ_for_server):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/valgrind (added)
• Scripts/valgrind/suppressions.txt (added)
• Scripts/webkitpy/port/gtk.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-08-21  Brian Holt  <brian.holt@samsung.com>
+
+        [GTK] Suppress irrelevant or known leaks for Valgrind
+        https://bugs.webkit.org/show_bug.cgi?id=119448
+
+        Reviewed by Martin Robinson.
+
+        Add a suppressions file to suppress known leaks for Valgrind.
+        Valgrind also takes longer when using suppressions and
+        times out unless the driver timeout is increased.
+
+        * Scripts/valgrind/suppressions.txt: Added.
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort.driver_stop_timeout):
+        (GtkPort.setup_environ_for_server):
+
 2013-08-20  Alex Christensen  <achristensen@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -71 +71 @@
         return multiplier * 6 * 1000
 
+    def driver_stop_timeout(self):
+        if self.get_option("leaks"):
+            # Wait the default timeout time before killing the process in driver.stop().
+            return self.default_timeout_ms()
+        return super(GtkPort, self).driver_stop_timeout()
+
     def setup_test_run(self):
         super(GtkPort, self).setup_test_run()
@@ -95 +101 @@
             xmlfilename = "".join(("drt-%p-", uuid.uuid1().hex, "-leaks.xml"))
             xmlfile = os.path.join(self.results_directory(), xmlfilename)
+            suppressionsfile = self.path_from_webkit_base('Tools', 'Scripts', 'valgrind', 'suppressions.txt')
             environment['VALGRIND_OPTS'] = \
                 "--tool=memcheck " \
@@ -109 +116 @@
                 "--gen-suppressions=all " \
                 "--xml=yes " \
-                "--xml-file=\"%s\" " % (xmlfile)
+                "--xml-file=\"%s\" " \
+                "--suppressions=%s" % (xmlfile, suppressionsfile)
         return environment