Title: [197121] trunk/Tools
Revision
197121
Author
a...@apple.com
Date
2016-02-25 11:10:04 -0800 (Thu, 25 Feb 2016)

Log Message

Enable MallocScribble when detecting leaks
https://bugs.webkit.org/show_bug.cgi?id=154679

Reviewed by Geoffrey Garen.

* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.setup_environ_for_server):
* Scripts/webkitpy/port/mac.py:
(MacPort.setup_environ_for_server):
* Scripts/webkitpy/port/mac_unittest.py:
(MacTest.test_setup_environ_for_server):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (197120 => 197121)


--- trunk/Tools/ChangeLog	2016-02-25 16:35:00 UTC (rev 197120)
+++ trunk/Tools/ChangeLog	2016-02-25 19:10:04 UTC (rev 197121)
@@ -1,3 +1,17 @@
+2016-02-25  Alexey Proskuryakov  <a...@apple.com>
+
+        Enable MallocScribble when detecting leaks
+        https://bugs.webkit.org/show_bug.cgi?id=154679
+
+        Reviewed by Geoffrey Garen.
+
+        * Scripts/webkitpy/port/ios.py:
+        (IOSSimulatorPort.setup_environ_for_server):
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.setup_environ_for_server):
+        * Scripts/webkitpy/port/mac_unittest.py:
+        (MacTest.test_setup_environ_for_server):
+
 2016-02-25  Eric Carlson  <eric.carl...@apple.com>
 
         Unreviewed, fix iOS builds after r197114.

Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (197120 => 197121)


--- trunk/Tools/Scripts/webkitpy/port/ios.py	2016-02-25 16:35:00 UTC (rev 197120)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py	2016-02-25 19:10:04 UTC (rev 197121)
@@ -269,6 +269,8 @@
             if self.get_option('leaks'):
                 env['MallocStackLogging'] = '1'
                 env['__XPC_MallocStackLogging'] = '1'
+                env['MallocScribble'] = '1'
+                env['__XPC_MallocScribble'] = '1'
             if self.get_option('guard_malloc'):
                 self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
                 self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')

Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (197120 => 197121)


--- trunk/Tools/Scripts/webkitpy/port/mac.py	2016-02-25 16:35:00 UTC (rev 197120)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py	2016-02-25 19:10:04 UTC (rev 197121)
@@ -102,6 +102,8 @@
             if self.get_option('leaks'):
                 env['MallocStackLogging'] = '1'
                 env['__XPC_MallocStackLogging'] = '1'
+                env['MallocScribble'] = '1'
+                env['__XPC_MallocScribble'] = '1'
             if self.get_option('guard_malloc'):
                 self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
                 self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')

Modified: trunk/Tools/Scripts/webkitpy/port/mac_unittest.py (197120 => 197121)


--- trunk/Tools/Scripts/webkitpy/port/mac_unittest.py	2016-02-25 16:35:00 UTC (rev 197120)
+++ trunk/Tools/Scripts/webkitpy/port/mac_unittest.py	2016-02-25 19:10:04 UTC (rev 197121)
@@ -93,6 +93,7 @@
         port = self.make_port(options=MockOptions(leaks=True, guard_malloc=True))
         env = port.setup_environ_for_server(port.driver_name())
         self.assertEqual(env['MallocStackLogging'], '1')
+        self.assertEqual(env['MallocScribble'], '1')
         self.assertEqual(env['DYLD_INSERT_LIBRARIES'], '/usr/lib/libgmalloc.dylib:/mock-build/libWebCoreTestShim.dylib')
 
     def _assert_search_path(self, port_name, baseline_path, search_paths, use_webkit2=False):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to