Changeset 252714 in webkit

Timestamp:

Nov 20, 2019, 3:21:10 PM (7 years ago)

Author:

Fujii Hironori

Message:

run-api-tests reports AssertionError os.pathsep not in value in _append_value_colon_separated in Cygwin Python
​https://bugs.webkit.org/show_bug.cgi?id=204400

Reviewed by Jonathan Bedard.

r249500 changed Port.environment_for_api_tests to use
Port._append_value_colon_separated to append a build path to some
enviroment variables. _append_value_colon_separated has a
assertion to ensure the given value doesn't iclude ':'. However,
Port._build_path contains ':' on Cygwin Python.

Those enviroment variables are only for macOS and iOS. Move the code to darwin.py.

• Scripts/webkitpy/port/base.py:

(Port.environment_for_api_tests):

• Scripts/webkitpy/port/darwin.py:

(DarwinPort.environment_for_api_tests):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/darwin.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-11-20  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        run-api-tests reports AssertionError os.pathsep not in value in _append_value_colon_separated in Cygwin Python
+        https://bugs.webkit.org/show_bug.cgi?id=204400
+
+        Reviewed by Jonathan Bedard.
+
+        r249500 changed Port.environment_for_api_tests to use
+        Port._append_value_colon_separated to append a build path to some
+        enviroment variables. _append_value_colon_separated has a
+        assertion to ensure the given value doesn't iclude ':'. However,
+        Port._build_path contains ':' on Cygwin Python.
+
+        Those enviroment variables are only for macOS and iOS. Move the code to darwin.py.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port.environment_for_api_tests):
+        * Scripts/webkitpy/port/darwin.py:
+        (DarwinPort.environment_for_api_tests):
+
 2019-11-20  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -261 +261 @@
 
     def environment_for_api_tests(self):
-        build_root_path = str(self._build_path())
-        environment = self.setup_environ_for_server()
-        for name in ['DYLD_LIBRARY_PATH', '__XPC_DYLD_LIBRARY_PATH', 'DYLD_FRAMEWORK_PATH', '__XPC_DYLD_FRAMEWORK_PATH']:
-            self._append_value_colon_separated(environment, name, build_root_path)
-
-        return environment
+        return self.setup_environ_for_server()
 
     def _check_driver(self):

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

@@ -270 +270 @@
     def app_executable_from_bundle(self, app_bundle):
         return self._plist_data_from_bundle(app_bundle, 'CFBundleExecutable')
+
+    def environment_for_api_tests(self):
+        environment = super(DarwinPort, self).environment_for_api_tests()
+        build_root_path = str(self._build_path())
+        for name in ['DYLD_LIBRARY_PATH', '__XPC_DYLD_LIBRARY_PATH', 'DYLD_FRAMEWORK_PATH', '__XPC_DYLD_FRAMEWORK_PATH']:
+            self._append_value_colon_separated(environment, name, build_root_path)
+        return environment