From: Nicolas Boichat Date: Wed, 30 Nov 2016 04:14:52 +0000 (+0800) Subject: GetDevices: Also allow `\.` to be part of the host name X-Git-Tag: upstream/0.1.0~445^2~58^2~6^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbf97155094231242208a7b3c3e74359041a6f97;p=platform%2Fupstream%2FVK-GL-CTS.git GetDevices: Also allow `\.` to be part of the host name Useful when connecting over TCP to a device with a given IP. Change-Id: Ibe3b75e5ba3ab0ff90219bb31d45e21d8f5fd61b --- diff --git a/android/scripts/common.py b/android/scripts/common.py index c7f3dc8..dfc3a8b 100644 --- a/android/scripts/common.py +++ b/android/scripts/common.py @@ -173,7 +173,7 @@ def getDevices (adb): if proc.returncode != 0: raise Exception("adb devices -l failed, got %d" % proc.returncode) - ptrn = re.compile(r'^([a-zA-Z0-9:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') + ptrn = re.compile(r'^([a-zA-Z0-9\.:]+)\s+.*product:([^\s]+)\s+model:([^\s]+)\s+device:([^\s]+)') devices = [] for line in stdout.splitlines()[1:]: if len(line.strip()) == 0: