Changeset 186665 in webkit


Ignore:
Timestamp:
Jul 9, 2015, 10:31:50 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
​https://bugs.webkit.org/show_bug.cgi?id=146820

Patch by Dewei Zhu <Dewei Zhu> on 2015-07-09
Reviewed by Ryosuke Niwa.

  • Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:

(OSXBrowserDriver):
(OSXBrowserDriver.close_browsers):
(OSXBrowserDriver._terminiate_processes):

  • Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:

(OSXChromeDriver):
(OSXChromeCanaryDriver):

  • Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:

(OSXFirefoxDriver):
(OSXFirefoxNightlyDriver):

  • Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:

(OSXSafariDriver):

Location:
trunk/Tools
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r186655 r186665  
     12015-07-09  Dewei Zhu  <dewei_zhu@apple.com>
     2
     3        Quick fix for run_benchmark script that AppKit.NSRunningApplication does not work properly
     4        https://bugs.webkit.org/show_bug.cgi?id=146820
     5
     6        Reviewed by Ryosuke Niwa.
     7
     8        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py:
     9        (OSXBrowserDriver):
     10        (OSXBrowserDriver.close_browsers):
     11        (OSXBrowserDriver._terminiate_processes):
     12        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py:
     13        (OSXChromeDriver):
     14        (OSXChromeCanaryDriver):
     15        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py:
     16        (OSXFirefoxDriver):
     17        (OSXFirefoxNightlyDriver):
     18        * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
     19        (OSXSafariDriver):
     20
    1212015-07-09  Michael Catanzaro  <mcatanzaro@igalia.com>
    222

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_browser_driver.py

    r185898 r186665  
    1111
    1212class OSXBrowserDriver(BrowserDriver):
    13     bundle_identifier = None
     13    process_name = None
    1414    platform = 'osx'
    1515
    … …  
    2020
    2121    def close_browsers(self):
    22         self._terminiate_processes(self.bundle_identifier)
     22        self._terminiate_processes(self.process_name)
    2323
    2424    @classmethod
    … …  
    3535
    3636    @classmethod
    37     def _terminiate_processes(cls, bundle_identifier):
    38         _log.info('Closing all terminating all processes with the bundle identifier %s' % bundle_identifier)
    39         from AppKit import NSRunningApplication
    40         processes = NSRunningApplication.runningApplicationsWithBundleIdentifier_(bundle_identifier)
    41         for process in processes:
    42             process.terminate()
     37    def _terminiate_processes(cls, process_name):
     38        _log.info('Closing all terminating all processes with name %s' % process_name)
     39        subprocess.call(['/usr/bin/killall', process_name])
    4340
    4441    @classmethod

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_chrome_driver.py

    r185898 r186665  
    1313
    1414class OSXChromeDriver(OSXBrowserDriver):
    15     bundle_identifier = 'com.google.Chrome'
     15    process_name = 'Google Chrome'
    1616    browser_name = 'chrome'
    1717
    … …  
    2121
    2222class OSXChromeCanaryDriver(OSXBrowserDriver):
    23     bundle_identifier = 'com.google.Chrome.canary'
     23    process_name = 'Google Chrome Canary'
    2424    browser_name = 'chrome-canary'
    2525

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_firefox_driver.py

    r185898 r186665  
    1313
    1414class OSXFirefoxDriver(OSXBrowserDriver):
    15     bundle_identifier = 'org.mozilla.firefox'
     15    process_name = 'firefox'
    1616    browser_name = 'firefox'
    1717
    … …  
    2121
    2222class OSXFirefoxNightlyDriver(OSXBrowserDriver):
    23     bundle_identifier = 'org.mozilla.nightly'
     23    process_name = 'firefox'
    2424    browser_name = 'firefox-nightly'
    2525

  • trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py

    r185898 r186665  
    1515
    1616class OSXSafariDriver(OSXBrowserDriver):
    17     bundle_identifier = 'com.apple.Safari'
     17    process_name = 'Safari'
    1818    browser_name = 'safari'
    1919
Note: See TracChangeset for help on using the changeset viewer.