Tools/Scripts/webkitpy/layout_tests/port/android.py - Issue 1313773002: Fix android adb version match

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Tools/Scripts/webkitpy/layout_tests/port/android.py

Issue 1313773002: Fix android adb version match (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Tools/Scripts/webkitpy/layout_tests/port/android.py

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/android.py b/Tools/Scripts/webkitpy/layout_tests/port/android.py

index 65feb52e02ddb845a9b6049d55eef09621464d5c..291ff3eaac1a3db61ee3fc697b130b6779104457 100644

--- a/Tools/Scripts/webkitpy/layout_tests/port/android.py

+++ b/Tools/Scripts/webkitpy/layout_tests/port/android.py

@@ -308,7 +308,7 @@ class AndroidCommands(object):

@staticmethod

def _determine_adb_version(adb_command_path, executive, debug_logging):

- re_version = re.compile('^.*version ([\d\.]+)$')

+ re_version = re.compile('^.*version ([\d\.]+)')

try:

output = executive.run_command([adb_command_path, 'version'], error_handler=executive.ignore_error,

debug_logging=debug_logging)

« no previous file with comments | « no previous file | no next file » | no next file with comments »