Title: [202071] trunk/Tools
- Revision
- 202071
- Author
- [email protected]
- Date
- 2016-06-14 16:38:32 -0700 (Tue, 14 Jun 2016)
Log Message
Tests don't work in iOS Simulator when ASan is enabled
https://bugs.webkit.org/show_bug.cgi?id=158726
Reviewed by David Kilzer.
* Scripts/webkitpy/port/driver.py:
(Driver._setup_environ_for_driver): Added a FIXME.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.setup_environ_for_server): Don't try to insert a dylib built for
simulator into LayoutTestRelay, which is a macOS tool.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (202070 => 202071)
--- trunk/Tools/ChangeLog 2016-06-14 23:28:11 UTC (rev 202070)
+++ trunk/Tools/ChangeLog 2016-06-14 23:38:32 UTC (rev 202071)
@@ -1,3 +1,16 @@
+2016-06-14 Alexey Proskuryakov <[email protected]>
+
+ Tests don't work in iOS Simulator when ASan is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=158726
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._setup_environ_for_driver): Added a FIXME.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.setup_environ_for_server): Don't try to insert a dylib built for
+ simulator into LayoutTestRelay, which is a macOS tool.
+
2016-06-14 Aakash Jain <[email protected]>
Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits unexpectedly
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (202070 => 202071)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-06-14 23:28:11 UTC (rev 202070)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-06-14 23:38:32 UTC (rev 202071)
@@ -322,6 +322,7 @@
def _setup_environ_for_driver(self, environment):
build_root_path = str(self._port._build_path())
+ # FIXME: DYLD_* variables should be Mac-only. Even iOS Simulator doesn't need them, as LayoutTestRelay is a host binary.
self._append_environment_variable_path(environment, 'DYLD_LIBRARY_PATH', build_root_path)
self._append_environment_variable_path(environment, '__XPC_DYLD_LIBRARY_PATH', build_root_path)
self._append_environment_variable_path(environment, 'DYLD_FRAMEWORK_PATH', build_root_path)
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (202070 => 202071)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2016-06-14 23:28:11 UTC (rev 202070)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2016-06-14 23:38:32 UTC (rev 202071)
@@ -278,7 +278,6 @@
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')
- 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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
