Attachment 357883 Details for Bug 192905 – Patch

[patch] Patch

bug-192905-20181220154739.patch (text/plain), 24.34 KB, created by Simon Fraser (smfr) on 2018-12-20 15:47:40 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-12-20 15:47:40 PST

Size: 24.34 KB

patch

obsolete

>Subversion Revision: 239465
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 368db4c37415566bb085bdf814ac52a2de38aff2..8683d5931d3a059efc6421ed2edae48147fc47e1 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,39 @@
>+2018-12-19  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Add support to run-benchmark to use non-default copies of the browser apps
>+        https://bugs.webkit.org/show_bug.cgi?id=192905
>+        rdar://problem/46845840
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        Add support for a --browser-path argument to run-benchmark, which allows you to use
>+        a custom app bundle for a given browser (only implemented for Safari at present).
>+
>+        * Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
>+        (BenchmarkRunner.__init__):
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
>+        (BrowserDriver.__init__):
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py:
>+        (BrowserDriverFactory.create):
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
>+        (OSXBrowserDriver._launch_process):
>+        (OSXBrowserDriver._launch_process_with_caffeinate): Fix spelling.
>+        (OSXBrowserDriver._launch_process_with_caffinate): Deleted.
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
>+        (OSXChromeCanaryDriver.launch_url):
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
>+        (OSXFirefoxNightlyDriver.launch_url):
>+        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
>+        (OSXSafariDriver.__init__):
>+        (OSXSafariDriver.launch_url):
>+        * Scripts/webkitpy/benchmark_runner/run_benchmark.py:
>+        (parse_args):
>+        (run_benchmark_plan):
>+        * Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py:
>+        (WebServerBenchmarkRunner.__init__):
>+        * Scripts/webkitpy/browserperfdash/browserperfdash_unittest.py:
>+        (FakeBenchmarkRunner.__init__):
>+
> 2018-12-20  Jonathan Bedard  <jbedard@apple.com>
> 
>         webkitpy: Autoinstall package URLs have changed
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py
>old mode 100644
>new mode 100755
>index 75e1c64c742a00404a77d6b6dde500583b9a888d..757d8b8adad6ba2b3b8e1ff9aebe647fec764d7f
>--- a/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py
>@@ -23,7 +23,7 @@ _log = logging.getLogger(__name__)
> class BenchmarkRunner(object):
>     name = 'benchmark_runner'
> 
>-    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser, scale_unit=True, show_iteration_values=False, device_id=None):
>+    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser, browser_path, scale_unit=True, show_iteration_values=False, device_id=None):
>         try:
>             plan_file = self._find_plan_file(plan_file)
>             with open(plan_file, 'r') as fp:
>@@ -36,6 +36,7 @@ class BenchmarkRunner(object):
>                 if count_override:
>                     self._plan['count'] = count_override
>                 self._browser_driver = BrowserDriverFactory.create(platform, browser)
>+                self._browser_path = browser_path
>                 self._build_dir = os.path.abspath(build_dir) if build_dir else None
>                 self._output_file = output_file
>                 self._scale_unit = scale_unit
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py
>old mode 100644
>new mode 100755
>index ffa2c688cb83e256c69aaf7d665d3fe6317ba827..f1af57e9ade2756c8b4dcdbbeab0b770d1c57f30
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py
>@@ -15,7 +15,7 @@ class BrowserDriver(object):
>         pass
> 
>     @abstractmethod
>-    def launch_url(self, url, options, browser_build_path=None):
>+    def launch_url(self, url, options, browser_build_path=None, browser_path=None):
>         pass
> 
>     @abstractmethod
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py
>old mode 100644
>new mode 100755
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py
>index 98b598c9c3c5755dcfa61e7b745c795acc2ddd7b..728d50b4a7b925fe2add45ef8e3d23c3e0d5d023 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py
>@@ -88,7 +88,7 @@ class LinuxBrowserDriver(BrowserDriver):
>                             browser_name=self.browser_name, browser_pid=self._browser_process.pid,
>                             browser_retcode=self._browser_process.returncode))
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         if not self._browser_arguments:
>             self._browser_arguments = [url]
>         exec_args = [self.process_name] + self._browser_arguments
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_chrome_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_chrome_driver.py
>index cef28679407eb67fa1a7747abc68b05d7a459456..4798603b2a530e557a191e881345b91541ff1a99 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_chrome_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_chrome_driver.py
>@@ -33,10 +33,10 @@ class LinuxChromeDriver(LinuxBrowserDriver):
>     browser_name = 'chrome'
>     process_search_list = ['chromium', 'chromium-browser', 'chrome']
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         self._browser_arguments = ['--temp-profile', '--start-maximized',
>                                    '--homepage', url]
>-        super(LinuxChromeDriver, self).launch_url(url, options, browser_build_path)
>+        super(LinuxChromeDriver, self).launch_url(url, options, browser_build_path, browser_path)
> 
>     def launch_driver(self, url, options, browser_build_path):
>         import webkitpy.thirdparty.autoinstalled.selenium
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_epiphany_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_epiphany_driver.py
>index d2c600e3121bf994ad65f743629084dc8b22f62b..b74a2f82d5d63ee4de5e57f0469deef4712ac3e7 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_epiphany_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_epiphany_driver.py
>@@ -31,11 +31,11 @@ class EpiphanyBrowserDriver(LinuxBrowserDriver):
>     browser_name = 'epiphany'
>     process_search_list = ['epiphany', 'epiphany-browser']
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         self._browser_arguments = ['--new-window', '-p',
>                                    '--profile={profile}'.format(profile=self._temp_profiledir),
>                                    url]
>-        super(EpiphanyBrowserDriver, self).launch_url(url, options, browser_build_path)
>+        super(EpiphanyBrowserDriver, self).launch_url(url, options, browser_build_path, browser_path)
> 
>     def launch_driver(self, url, options, browser_build_path):
>         raise ValueError("Browser {browser} is not available with webdriver".format(browser=self.browser_name))
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_firefox_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_firefox_driver.py
>index 4cb3cf1a1ec2cb46e1de8821486c26927c8685e0..dff764c17f1c3c22a9044f7a45c72d8d90d4c3f2 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_firefox_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_firefox_driver.py
>@@ -33,12 +33,12 @@ class LinuxFirefoxDriver(LinuxBrowserDriver):
>     browser_name = 'firefox'
>     process_search_list = ['firefox', 'firefox-bin']
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         self._browser_arguments = ['-new-instance', '-profile', self._temp_profiledir,
>                                    '-width', str(self._screen_size().width),
>                                    '-height', str(self._screen_size().height),
>                                    url]
>-        super(LinuxFirefoxDriver, self).launch_url(url, options, browser_build_path)
>+        super(LinuxFirefoxDriver, self).launch_url(url, options, browser_build_path, browser_path)
> 
>     def launch_driver(self, url, options, browser_build_path):
>         import webkitpy.thirdparty.autoinstalled.selenium
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_minibrowsergtk_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_minibrowsergtk_driver.py
>index 3148f7f7046814f19e24ee414fb3d4e01d08d2ff..e8d5c09f61c771590b3260ef594487b46fe0d7fb 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_minibrowsergtk_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_minibrowsergtk_driver.py
>@@ -31,13 +31,13 @@ class GTKMiniBrowserDriver(LinuxBrowserDriver):
>     browser_name = 'minibrowser-gtk'
>     process_search_list = ['Tools/Scripts/run-minibrowser', 'MiniBrowser']
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         self._browser_arguments = []
>         if self.process_name.endswith('run-minibrowser'):
>             self._browser_arguments.append('--gtk')
>         self._browser_arguments.append('--geometry={w}x{h}'.format(w=self._screen_size().width, h=self._screen_size().height))
>         self._browser_arguments.append(url)
>-        super(GTKMiniBrowserDriver, self).launch_url(url, options, browser_build_path)
>+        super(GTKMiniBrowserDriver, self).launch_url(url, options, browser_build_path, browser_path)
> 
>     def launch_driver(self, url, options, browser_build_path):
>         raise ValueError("Browser {browser} is not available with webdriver".format(browser=self.browser_name))
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py
>index 505c2210327cce9dd73da1b825a04385f9015743..9095931c3465b23b331673feecf97c82b2d662aa 100644
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py
>@@ -40,7 +40,7 @@ class OSXBrowserDriver(BrowserDriver):
> 
>         # FIXME: May need to be modified for a local build such as setting up DYLD libraries
>         args = ['open', '-a', app_path] + args
>-        cls._launch_process_with_caffinate(args)
>+        cls._launch_process_with_caffeinate(args)
> 
>     @classmethod
>     def _launch_webdriver(cls, url, driver):
>@@ -57,8 +57,13 @@ class OSXBrowserDriver(BrowserDriver):
>         subprocess.call(['/usr/bin/killall', process_name])
> 
>     @classmethod
>-    def _launch_process_with_caffinate(cls, args, env=None):
>-        process = subprocess.Popen(args, env=env)
>+    def _launch_process_with_caffeinate(cls, args, env=None):
>+        try:
>+            process = subprocess.Popen(args, env=env)
>+        except Exception as error:
>+            _log.error('Popen failed: {error}'.format(error=error))
>+            return
>+
>         subprocess.Popen(["/usr/bin/caffeinate", "-disw", str(process.pid)])
>         return process
> 
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py
>old mode 100644
>new mode 100755
>index 43b3c7ee20145bf0aaa1052eb0e92f913ce36577..b39626e745ea026200626ad08702aebac2ccebd4
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py
>@@ -14,7 +14,8 @@ class OSXChromeDriver(OSXBrowserDriver):
>     browser_name = 'chrome'
>     app_name = 'Google Chrome.app'
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>+        # FIXME: handle self._browser_path.
>         args_with_url = self._insert_url(create_args(), 2, url)
>         self._launch_process(build_dir=browser_build_path, app_name=self.app_name, url=url, args=args_with_url)
> 
>@@ -37,7 +38,8 @@ class OSXChromeCanaryDriver(OSXBrowserDriver):
>     browser_name = 'chrome-canary'
>     app_name = 'Google Chrome Canary.app'
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>+        # FIXME: handle self._browser_path.
>         args_with_url = self._insert_url(create_args(), 2, url)
>         self._launch_process(build_dir=browser_build_path, app_name=self.app_name, url=url, args=args_with_url)
> 
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py
>old mode 100644
>new mode 100755
>index a23d252210d71c1dc6c5d46991876597c40e257c..fa0997d6d1c9b44d61bb47901aa3d29085722b3b
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py
>@@ -14,7 +14,8 @@ class OSXFirefoxDriver(OSXBrowserDriver):
>     browser_name = 'firefox'
>     app_name = 'Firefox.app'
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>+        # FIXME: handle self._browser_path.
>         args_with_url = self._insert_url(create_args(), 0, url)
>         self._launch_process(build_dir=browser_build_path, app_name=self.app_name, url=url, args=args_with_url)
> 
>@@ -38,7 +39,8 @@ class OSXFirefoxNightlyDriver(OSXBrowserDriver):
>     browser_name = 'firefox-nightly'
>     app_name = 'FirefoxNightly.app'
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>+        # FIXME: handle self._browser_path.
>         args_with_url = self._insert_url(create_args(), 0, url)
>         self._launch_process(build_dir=browser_build_path, app_name=self.app_name, url=url, args=args_with_url)
> 
>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
>old mode 100644
>new mode 100755
>index a20ada44c90bc8d704eef160c1508213a4bcc3a8..1b1ad33b3fbd75b9278ee54936a1d8da9455e055
>--- a/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py
>@@ -24,7 +24,7 @@ class OSXSafariDriver(OSXBrowserDriver):
>         self._maximize_window()
>         self._safari_preferences = ["-HomePage", "about:blank", "-WarnAboutFraudulentWebsites", "0", "-ExtensionsEnabled", "0", "-ShowStatusBar", "0", "-NewWindowBehavior", "1", "-NewTabBehavior", "1"]
> 
>-    def launch_url(self, url, options, browser_build_path):
>+    def launch_url(self, url, options, browser_build_path, browser_path):
>         args = ['/Applications/Safari.app/Contents/MacOS/Safari']
>         env = {}
>         if browser_build_path:
>@@ -34,10 +34,16 @@ class OSXSafariDriver(OSXBrowserDriver):
>                 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)
>+        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)
> 
>         args.extend(self._safari_preferences)
>         _log.info('Launching safari: %s with url: %s' % (args[0], url))
>-        self._safari_process = OSXSafariDriver._launch_process_with_caffinate(args, env)
>+        self._safari_process = OSXSafariDriver._launch_process_with_caffeinate(args, env)
> 
>         # Stop for initialization of the safari process, otherwise, open
>         # command may use the system safari.
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py b/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py
>index 8752f2b6fc76b4410bb4bc64650c7e8a6925f9bd..ac3fee0d9b54f03e787729eaa63f559f47e3270c 100755
>--- a/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py
>@@ -40,9 +40,13 @@ def parse_args():
>     mutual_group.add_argument('--allplans', action='store_true', help='Run all available benchmark plans in order.')
>     mutual_group.add_argument('--read-results-json', dest='json_file', help='Instead of running a benchmark, format the output saved in JSON_FILE.')
>     parser.add_argument('--output-file', default=None, help='Save detailed results to OUTPUT in JSON format. By default, results will not be saved.')
>-    parser.add_argument('--build-directory', dest='build_dir', help='Path to the browser executable (e.g. WebKitBuild/Release/).')
>     parser.add_argument('--count', type=int, help='Number of times to run the benchmark (e.g. 5).')
>     parser.add_argument('--driver', default=WebServerBenchmarkRunner.name, choices=benchmark_runner_subclasses.keys(), help='Use the specified benchmark driver. Defaults to %s.' % WebServerBenchmarkRunner.name)
>+
>+    group = parser.add_mutually_exclusive_group()
>+    group.add_argument('--browser-path', help='Specify the path to a non-default copy of the target browser as a path to the .app.')
>+    group.add_argument('--build-directory', dest='build_dir', help='Path to the browser executable (e.g. WebKitBuild/Release/).')
>+
>     parser.add_argument('--browser', default=default_browser(), choices=BrowserDriverFactory.available_browsers(), help='Browser to run the nechmark in. Defaults to %s.' % default_browser())
>     parser.add_argument('--platform', default=default_platform(), choices=BrowserDriverFactory.available_platforms(), help='Platform that this script is running on. Defaults to %s.' % default_platform())
>     parser.add_argument('--local-copy', help='Path to a local copy of the benchmark (e.g. PerformanceTests/SunSpider/).')
>@@ -65,7 +69,7 @@ def parse_args():
> 
> def run_benchmark_plan(args, plan):
>     benchmark_runner_class = benchmark_runner_subclasses[args.driver]
>-    runner = benchmark_runner_class(plan, args.local_copy, args.count, args.build_dir, args.output_file, args.platform, args.browser, args.scale_unit, args.show_iteration_values, args.device_id)
>+    runner = benchmark_runner_class(plan, args.local_copy, args.count, args.build_dir, args.output_file, args.platform, args.browser, args.browser_path, args.scale_unit, args.show_iteration_values, args.device_id)
>     runner.execute()
> 
> 
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/webdriver_benchmark_runner.py b/Tools/Scripts/webkitpy/benchmark_runner/webdriver_benchmark_runner.py
>old mode 100644
>new mode 100755
>index 7d0772ab0d90272ff9e1fcd4514c901f67c37942..b3b6cc837d2922ebd8fb6827b444b8b5d196f64f
>--- a/Tools/Scripts/webkitpy/benchmark_runner/webdriver_benchmark_runner.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/webdriver_benchmark_runner.py
>@@ -22,7 +22,7 @@ class WebDriverBenchmarkRunner(BenchmarkRunner):
>         result = None
>         try:
>             url = 'file://{root}/{plan_name}/{test_file}'.format(root=web_root, plan_name=self._plan_name, test_file=test_file)
>-            driver = self._browser_driver.launch_driver(url, self._plan['options'], self._build_dir)
>+            driver = self._browser_driver.launch_driver(url, self._plan['options'], self._build_dir, self._browser_path)
>             _log.info('Waiting on results from web browser')
>             result = WebDriverWait(driver, self._plan['timeout'], poll_frequency=1.0).until(self._get_result)
>             driver.quit()
>diff --git a/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py b/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py
>old mode 100644
>new mode 100755
>index b0cb88d917373f93684689e48b19d91a4b0f85f5..3cb14eca5e388c6446a4c696a35e36f0da01c0a2
>--- a/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py
>+++ b/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py
>@@ -15,10 +15,10 @@ _log = logging.getLogger(__name__)
> class WebServerBenchmarkRunner(BenchmarkRunner):
>     name = 'webserver'
> 
>-    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser, scale_unit=True, show_iteration_values=False, device_id=None):
>+    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser, browser_path, scale_unit=True, show_iteration_values=False, device_id=None):
>         self._http_server_driver = HTTPServerDriverFactory.create(platform)
>         self._http_server_driver.set_device_id(device_id)
>-        super(WebServerBenchmarkRunner, self).__init__(plan_file, local_copy, count_override, build_dir, output_file, platform, browser, scale_unit, show_iteration_values, device_id)
>+        super(WebServerBenchmarkRunner, self).__init__(plan_file, local_copy, count_override, build_dir, output_file, platform, browser, browser_path, scale_unit, show_iteration_values, device_id)
> 
>     def _get_result(self, test_url):
>         result = self._browser_driver.add_additional_results(test_url, self._http_server_driver.fetch_result())
>@@ -30,7 +30,7 @@ class WebServerBenchmarkRunner(BenchmarkRunner):
>         try:
>             self._http_server_driver.serve(web_root)
>             url = urlparse.urljoin(self._http_server_driver.base_url(), self._plan_name + '/' + test_file)
>-            self._browser_driver.launch_url(url, self._plan['options'], self._build_dir)
>+            self._browser_driver.launch_url(url, self._plan['options'], self._build_dir, self._browser_path)
>             with Timeout(self._plan['timeout']):
>                 result = self._get_result(url)
>         finally:
>diff --git a/Tools/Scripts/webkitpy/browserperfdash/browserperfdash_unittest.py b/Tools/Scripts/webkitpy/browserperfdash/browserperfdash_unittest.py
>old mode 100644
>new mode 100755
>index 34615186414ddd71c0a9c02ad7fb95a46353f81e..d8cbf009b812d441b6616bfbffd0419489dcb98c
>--- a/Tools/Scripts/webkitpy/browserperfdash/browserperfdash_unittest.py
>+++ b/Tools/Scripts/webkitpy/browserperfdash/browserperfdash_unittest.py
>@@ -40,8 +40,8 @@ _log = logging.getLogger(__name__)
> class FakeBenchmarkRunner(BenchmarkRunner):
>     name = 'fake'
> 
>-    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser):
>-        super(FakeBenchmarkRunner, self).__init__(plan_file, local_copy, count_override, build_dir, output_file, platform, browser)
>+    def __init__(self, plan_file, local_copy, count_override, build_dir, output_file, platform, browser, browser_path):
>+        super(FakeBenchmarkRunner, self).__init__(plan_file, local_copy, count_override, build_dir, output_file, platform, browser, browser_path)
> 
>     def execute(self):
>         return True
>@@ -60,5 +60,5 @@ class BrowserPerfDashRunnerTest(unittest.TestCase):
>         # This tests that constructing the benchmark_runner object specifying the minimum required paramaters is ok.
>         plan_list = BenchmarkRunner.available_plans()
>         build_dir = os.path.abspath(os.curdir)
>-        runner = FakeBenchmarkRunner(plan_list[0], False, 1, build_dir, "/tmp/testOutput.txt", default_platform(), default_browser())
>+        runner = FakeBenchmarkRunner(plan_list[0], False, 1, build_dir, "/tmp/testOutput.txt", default_platform(), default_browser(), None)
>         self.assertTrue(runner.execute())

Flags:

dewei_zhu: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192905: 357763 | 357879 | 357883