diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 19:46:13 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-22 19:46:13 +0000 |
| commit | 956e25a90a2b45cab686d543e0c19c534bfbb313 (patch) | |
| tree | e099b5253c80f4d0108e165a9704b93f47498e5f | |
| parent | 1be20cf01e302fe147eef6eb59f8b6faf011032d (diff) | |
| download | chromium_src-956e25a90a2b45cab686d543e0c19c534bfbb313.zip chromium_src-956e25a90a2b45cab686d543e0c19c534bfbb313.tar.gz chromium_src-956e25a90a2b45cab686d543e0c19c534bfbb313.tar.bz2 | |
Telemetry: fixes --device option / multiple devices.
Uses the corresponding --device if specified.
BUG=
TEST=./tools/perf/run_multipage_benchmarks --browser=android-chrome --device FOOBAR --show-stdout sunspider_benchmark tools/perf/page_sets/sunspider.json
Review URL: https://chromiumcodereview.appspot.com/11419141
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169297 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/telemetry/telemetry/android_browser_finder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/telemetry/telemetry/android_browser_finder.py b/tools/telemetry/telemetry/android_browser_finder.py index 838960b..2661435 100644 --- a/tools/telemetry/telemetry/android_browser_finder.py +++ b/tools/telemetry/telemetry/android_browser_finder.py @@ -83,10 +83,10 @@ def FindAllAvailableBrowsers(options, logging=real_logging): return [] device = None - if not options.android_device: - devices = adb_commands.GetAttachedDevices() + if options.android_device: + devices = [options.android_device] else: - devices = [] + devices = adb_commands.GetAttachedDevices() if len(devices) == 0: logging.info('No android devices found.') |