Attachment 370810 Details for Bug 198316 – Patch

[patch] Patch

bug-198316-20190528172606.patch (text/plain), 2.46 KB, created by dewei_zhu on 2019-05-28 17:26:07 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: dewei_zhu

Created: 2019-05-28 17:26:07 PDT

Size: 2.46 KB

patch

obsolete

>Subversion Revision: 245826
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c04709316545358512f15643e403608f1626bb31..62e37d2490761f2cfad1c369f763e7e0c233c6ee 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-05-28  Dewei Zhu  <dewei_zhu@apple.com>
>+
>+        run-benchmark should report an error if the argument to --build-directory is bogus
>+        https://bugs.webkit.org/show_bug.cgi?id=198316
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        'run-benchmark' should not fallback to system safari when browser or browser build path is
>+        specified but not valid.
>+
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
>+        (OSXSafariDriver.launch_url): Raise an exception when browser or browser build path is
>+        specified but not valid.
>+
> 2019-05-25  Dewei Zhu  <dewei_zhu@apple.com>
> 
>         Limit run-benchmark http server to specific interface.
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py
>index 7b26e693a9a11b519ac8e37b08bdafbba1406681..417a59e543a1f4ae233c681f8a99fe364e62754e 100755
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py
>@@ -32,13 +32,13 @@ class OSXSafariDriver(OSXBrowserDriver):
>                 args = [safari_app_in_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)
>+                raise Exception('Could not find Safari.app at {}'.format(safari_app_in_build_path))
>         elif browser_path:
>             safari_app_in_browser_path = os.path.join(browser_path, 'Contents/MacOS/Safari')
>             if os.path.exists(safari_app_in_browser_path):
>                 args = [safari_app_in_browser_path]
>             else:
>-                _log.info('Could not find application at %s, using the system Safari instead' % safari_app_in_browser_path)
>+                raise Exception('Could not find Safari.app at {}'.format(safari_app_in_browser_path))
> 
>         args.extend(self._safari_preferences)
>         _log.info('Launching safari: %s with url: %s' % (args[0], url))

Actions: View | Formatted Diff | Diff

Attachments on bug 198316: 370810 | 370991 | 371020 | 371038