Tests don't work in iOS Simulator when ASan is enabled
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jun 2016 23:38:32 +0000 (23:38 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Jun 2016 23:38:32 +0000 (23:38 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@202071 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/driver.py
Tools/Scripts/webkitpy/port/ios.py

index 59c98f5..524fd37 100644 (file)
@@ -1,3 +1,16 @@
+2016-06-14  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <aakash_jain@apple.com>
 
         Continuous "Reentrancy avoided" error messages in run-webkit-tests if Simulator quits unexpectedly
index c8615b3..57c0e0f 100644 (file)
@@ -322,6 +322,7 @@ class Driver(object):
 
     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)
index bec6c2f..acc7e3e 100644 (file)
@@ -278,7 +278,6 @@ class IOSSimulatorPort(Port):
             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