Title: [223226] trunk/Tools
- Revision
- 223226
- Author
- [email protected]
- Date
- 2017-10-11 18:15:15 -0700 (Wed, 11 Oct 2017)
Log Message
run-benchmark script should set '__XPC_DYLD_FRAMEWORK_PATH' while launching local-built Safari on Mac.
https://bugs.webkit.org/show_bug.cgi?id=178199
Reviewed by Saam Barati.
'__XPC_DYLD_FRAMEWORK_PATH' should be set while launching Safari on run-benchmark script.
'force_remove' function should support both file and directory.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launch_url):
* Scripts/webkitpy/benchmark_runner/utils.py:
(force_remove):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (223225 => 223226)
--- trunk/Tools/ChangeLog 2017-10-12 01:13:19 UTC (rev 223225)
+++ trunk/Tools/ChangeLog 2017-10-12 01:15:15 UTC (rev 223226)
@@ -1,3 +1,18 @@
+2017-10-11 Dewei Zhu <[email protected]>
+
+ run-benchmark script should set '__XPC_DYLD_FRAMEWORK_PATH' while launching local-built Safari on Mac.
+ https://bugs.webkit.org/show_bug.cgi?id=178199
+
+ Reviewed by Saam Barati.
+
+ '__XPC_DYLD_FRAMEWORK_PATH' should be set while launching Safari on run-benchmark script.
+ 'force_remove' function should support both file and directory.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.launch_url):
+ * Scripts/webkitpy/benchmark_runner/utils.py:
+ (force_remove):
+
2017-10-11 Saam Barati <[email protected]>
Runtime disable poly proto because it may be a 3-4% Speedometer regression
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (223225 => 223226)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2017-10-12 01:13:19 UTC (rev 223225)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2017-10-12 01:15:15 UTC (rev 223226)
@@ -31,7 +31,7 @@
safari_app_in_build_path = os.path.join(browser_build_path, 'Safari.app/Contents/MacOS/Safari')
if os.path.exists(safari_app_in_build_path):
args = [safari_app_in_build_path]
- env = {'DYLD_FRAMEWORK_PATH': browser_build_path, 'DYLD_LIBRARY_PATH': browser_build_path, '__XPC_DYLD_LIBRARY_PATH': browser_build_path}
+ env = {'DYLD_FRAMEWORK_PATH': browser_build_path, 'DYLD_LIBRARY_PATH': browser_build_path, '__XPC_DYLD_FRAMEWORK_PATH': browser_build_path, '__XPC_DYLD_LIBRARY_PATH': browser_build_path}
else:
_log.info('Could not find Safari.app at %s, using the system Safari instead' % safari_app_in_build_path)
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py (223225 => 223226)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2017-10-12 01:13:19 UTC (rev 223225)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2017-10-12 01:15:15 UTC (rev 223226)
@@ -39,7 +39,10 @@
def force_remove(path):
try:
- shutil.rmtree(path)
+ if os.path.isdir(path):
+ shutil.rmtree(path)
+ else:
+ os.remove(path)
except Exception as error:
# Directory/file does not exist or privilege issue, just ignore it
_log.info("Error removing %s: %s" % (path, error))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
