Re: [Lldb-commits] [PATCH] D14765: Support unix-abstract-connect scheme as platform url in lldb testsuite

[Ying Chen via lldb-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL253488: Support unix-abstract-connect scheme as platform url 
in lldb testsuite (authored by chying).

Changed prior to commit:
  http://reviews.llvm.org/D14765?vs=40469=40535#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D14765

Files:
  lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
  
lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py

Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -461,8 +461,11 @@
 assert lldb.platform_url is not None
 device_id = None
 parsed_url = urlparse.urlparse(lldb.platform_url)
-if parsed_url.scheme == "adb":
-device_id = parsed_url.netloc.split(":")[0]
+host_name = parsed_url.netloc.split(":")[0]
+if host_name != 'localhost':
+device_id = host_name
+if device_id.startswith('[') and device_id.endswith(']'):
+device_id = device_id[1:-1]
 retcode, stdout, stderr = run_adb_command(
 ["shell", "getprop", "ro.build.version.sdk"], device_id)
 if retcode == 0:
Index: 
lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
===
--- 
lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ 
lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -61,8 +61,12 @@
 self.named_pipe_fd = None
 self.stub_sends_two_stop_notifications_on_kill = False
 if lldb.platform_url:
-scheme, host = re.match('(.+)://(.+):\d+', 
lldb.platform_url).groups()
-if scheme == 'adb':
+if lldb.platform_url.startswith('unix-'):
+url_pattern = '(.+)://\[?(.+?)\]?/.*'
+else:
+url_pattern = '(.+)://(.+):\d+'
+scheme, host = re.match(url_pattern, lldb.platform_url).groups()
+if lldb.remote_platform_name == 'remote-android' and host != 
'localhost':
 self.stub_device = host
 self.stub_hostname = 'localhost'
 else:


Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -461,8 +461,11 @@
 assert lldb.platform_url is not None
 device_id = None
 parsed_url = urlparse.urlparse(lldb.platform_url)
-if parsed_url.scheme == "adb":
-device_id = parsed_url.netloc.split(":")[0]
+host_name = parsed_url.netloc.split(":")[0]
+if host_name != 'localhost':
+device_id = host_name
+if device_id.startswith('[') and device_id.endswith(']'):
+device_id = device_id[1:-1]
 retcode, stdout, stderr = run_adb_command(
 ["shell", "getprop", "ro.build.version.sdk"], device_id)
 if retcode == 0:
Index: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
===
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -61,8 +61,12 @@
 self.named_pipe_fd = None
 self.stub_sends_two_stop_notifications_on_kill = False
 if lldb.platform_url:
-scheme, host = re.match('(.+)://(.+):\d+', lldb.platform_url).groups()
-if scheme == 'adb':
+if lldb.platform_url.startswith('unix-'):
+url_pattern = '(.+)://\[?(.+?)\]?/.*'
+else:
+url_pattern = '(.+)://(.+):\d+'
+scheme, host = re.match(url_pattern, lldb.platform_url).groups()
+if lldb.remote_platform_name == 'remote-android' and host != 'localhost':
 self.stub_device = host
 self.stub_hostname = 'localhost'
 else:
___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Re: [Lldb-commits] [PATCH] D14765: Support unix-abstract-connect scheme as platform url in lldb testsuite

[Ying Chen via lldb-commits]

chying marked an inline comment as done.
chying added a comment.

http://reviews.llvm.org/D14765



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Re: [Lldb-commits] [PATCH] D14765: Support unix-abstract-connect scheme as platform url in lldb testsuite

[Oleksiy Vyalov via lldb-commits]

ovyalov accepted this revision.
ovyalov added a comment.
This revision is now accepted and ready to land.

LGTM



Comment at: packages/Python/lldbsuite/test/lldbtest.py:464
@@ -463,3 +463,3 @@
 parsed_url = urlparse.urlparse(lldb.platform_url)
-if parsed_url.scheme == "adb":
+if parsed_url.netloc.split(":")[0] != 'localhost':
 device_id = parsed_url.netloc.split(":")[0]

Nit - you may save parsed_url.netloc.split(":")[0] as local variable like 
host_name


http://reviews.llvm.org/D14765



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits

Re: [Lldb-commits] [PATCH] D14765: Support unix-abstract-connect scheme as platform url in lldb testsuite

[Ying Chen via lldb-commits]

chying marked 2 inline comments as done.


Comment at: 
packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py:69
@@ -66,1 +68,3 @@
+scheme, host = re.match(url_pattern, lldb.platform_url).groups()
+if lldb.remote_platform_name == 'remote-android' and host != 
'localhost':
 self.stub_device = host

As discussed offline, add check for remote platform is android as well.


http://reviews.llvm.org/D14765



___
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits