Title: [189128] trunk/Tools
- Revision
- 189128
- Author
- a...@apple.com
- Date
- 2015-08-28 15:50:43 -0700 (Fri, 28 Aug 2015)
Log Message
Fix run-webkit-tests --additional-env-var="DYLD_INSERT_LIBRARIES=..."
https://bugs.webkit.org/show_bug.cgi?id=148592
Reviewed by Tim Horton.
* Scripts/webkitpy/port/base.py:
(Port.to.setup_environ_for_server):
(Port.to):
(Port.to._append_value_colon_separated):
(Port.to.show_results_html_file):
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.setup_environ_for_server):
* Scripts/webkitpy/port/mac.py:
(MacPort.setup_environ_for_server):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (189127 => 189128)
--- trunk/Tools/ChangeLog 2015-08-28 22:46:34 UTC (rev 189127)
+++ trunk/Tools/ChangeLog 2015-08-28 22:50:43 UTC (rev 189128)
@@ -1,3 +1,20 @@
+2015-08-28 Alexey Proskuryakov <a...@apple.com>
+
+ Fix run-webkit-tests --additional-env-var="DYLD_INSERT_LIBRARIES=..."
+ https://bugs.webkit.org/show_bug.cgi?id=148592
+
+ Reviewed by Tim Horton.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.to.setup_environ_for_server):
+ (Port.to):
+ (Port.to._append_value_colon_separated):
+ (Port.to.show_results_html_file):
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.setup_environ_for_server):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.setup_environ_for_server):
+
2015-08-28 Filip Pizlo <fpi...@apple.com>
LICM should be sound even if the CFG has changed
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (189127 => 189128)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-08-28 22:46:34 UTC (rev 189127)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-08-28 22:50:43 UTC (rev 189128)
@@ -853,6 +853,14 @@
return clean_env
+ @staticmethod
+ def _append_value_colon_separated(env, name, value):
+ assert ":" not in value
+ if name in env and env[name]:
+ env[name] = env[name] + ":" + value
+ else:
+ env[name] = value
+
def show_results_html_file(self, results_filename):
"""This routine should display the HTML file pointed at by
results_filename in a users' browser."""
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (189127 => 189128)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-28 22:46:34 UTC (rev 189127)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-08-28 22:50:43 UTC (rev 189128)
@@ -231,9 +231,8 @@
if self.get_option('leaks'):
env['MallocStackLogging'] = '1'
if self.get_option('guard_malloc'):
- env['DYLD_INSERT_LIBRARIES'] = '/usr/lib/libgmalloc.dylib:' + self._build_path("libWebCoreTestShim.dylib")
- else:
- env['DYLD_INSERT_LIBRARIES'] = self._build_path("libWebCoreTestShim.dylib")
+ self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
+ self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (189127 => 189128)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-08-28 22:46:34 UTC (rev 189127)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-08-28 22:50:43 UTC (rev 189128)
@@ -102,9 +102,8 @@
if self.get_option('leaks'):
env['MallocStackLogging'] = '1'
if self.get_option('guard_malloc'):
- env['DYLD_INSERT_LIBRARIES'] = '/usr/lib/libgmalloc.dylib:' + self._build_path("libWebCoreTestShim.dylib")
- else:
- env['DYLD_INSERT_LIBRARIES'] = self._build_path("libWebCoreTestShim.dylib")
+ self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
+ self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
