Title: [252714] trunk/Tools
- Revision
- 252714
- Author
- [email protected]
- Date
- 2019-11-20 15:21:10 -0800 (Wed, 20 Nov 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (252713 => 252714)
--- trunk/Tools/ChangeLog 2019-11-20 23:12:41 UTC (rev 252713)
+++ trunk/Tools/ChangeLog 2019-11-20 23:21:10 UTC (rev 252714)
@@ -1,3 +1,23 @@
+2019-11-20 Fujii Hironori <[email protected]>
+
+ 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 <[email protected]>
[WebGL] Add `--webgl-test-suite` flag for run-webkit-tests
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (252713 => 252714)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2019-11-20 23:12:41 UTC (rev 252713)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2019-11-20 23:21:10 UTC (rev 252714)
@@ -260,13 +260,8 @@
return True
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 self.setup_environ_for_server()
- return environment
-
def _check_driver(self):
driver_path = self._path_to_driver()
if not self._filesystem.exists(driver_path):
Modified: trunk/Tools/Scripts/webkitpy/port/darwin.py (252713 => 252714)
--- trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-11-20 23:12:41 UTC (rev 252713)
+++ trunk/Tools/Scripts/webkitpy/port/darwin.py 2019-11-20 23:21:10 UTC (rev 252714)
@@ -269,3 +269,10 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
