diff options
| author | oysteine@chromium.org <oysteine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 03:35:18 +0000 |
|---|---|---|
| committer | oysteine@chromium.org <oysteine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-24 03:35:18 +0000 |
| commit | 646d50c4e5fef6d70fadb0f3d87c67440f58daaa (patch) | |
| tree | 6cf91233911553c6c3b39061ce4ff45eb62808e0 /tools | |
| parent | f3ab6eff57d03d6b363dc554b4cb0d40ad448c75 (diff) | |
| download | chromium_src-646d50c4e5fef6d70fadb0f3d87c67440f58daaa.zip chromium_src-646d50c4e5fef6d70fadb0f3d87c67440f58daaa.tar.gz chromium_src-646d50c4e5fef6d70fadb0f3d87c67440f58daaa.tar.bz2 | |
Telemetry: Pick newest built browser when several browsers of the same type are present
This is needed when there is both an xcode-built browser and a Ninja-built browser present
locally, for example (needed by thakis@ to safely switch the Mac default build type)
R=tonyg@chromium.org, bulach@chromium.org
BUG=294387
Review URL: https://codereview.chromium.org/37693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230620 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py | 3 | ||||
| -rw-r--r-- | tools/telemetry/telemetry/core/browser_finder.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py index 5bce942..0ec35212 100644 --- a/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py +++ b/tools/telemetry/telemetry/core/backends/chrome/desktop_browser_finder.py @@ -40,7 +40,8 @@ class PossibleDesktopBrowser(possible_browser.PossibleBrowser): self.is_local_build = is_local_build def __repr__(self): - return 'PossibleDesktopBrowser(browser_type=%s)' % self.browser_type + return 'PossibleDesktopBrowser(browser_type=%s, executable=%s)' % ( + self.browser_type, self._local_executable) def Create(self): backend = desktop_browser_backend.DesktopBrowserBackend( diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/core/browser_finder.py index a58a8cd..ab0f4e2 100644 --- a/tools/telemetry/telemetry/core/browser_finder.py +++ b/tools/telemetry/telemetry/core/browser_finder.py @@ -93,7 +93,10 @@ def FindBrowser(options): elif len(matching_browsers) > 1: logging.warning('Multiple browsers of the same type found: %s' % ( repr(matching_browsers))) - return matching_browsers[0] + chosen_browser = sorted(matching_browsers, + key=lambda b: b.last_modification_time())[-1] + logging.warning('Choosing newest browser: %s' % (repr(chosen_browser))) + return chosen_browser else: return None |