24 files changed, 21 insertions, 21 deletions
diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
index d66117f1b90..3001b4c40f9 100644
--- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
@@ -13,6 +13,7 @@ import unittest2
 class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):
 
     mydir = TestBase.compute_mydir(__file__)
+    lldb_server_path = "lldb-server"
 
     @lldbmi_test
     @expectedFailureWindows("llvm.org/pr22274: need a pexpect replacement for windows")
@@ -88,7 +89,7 @@ class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):
         """Test that 'lldb-mi --interpreter' notifies after it was stopped on entry (remote)."""
 
         # Prepare debugserver
-        sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "lldb-gdbserver")))
+        sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", lldb_server_path)))
         import lldbgdbserverutils
         debugserver_exe = lldbgdbserverutils.get_debugserver_exe()
         if not debugserver_exe:
@@ -164,7 +165,7 @@ class MiSignalTestCase(lldbmi_testcase.MiTestCaseBase):
         """Test that 'lldb-mi --interpreter' notifies after it was stopped when segfault occurred (remote)."""
 
         # Prepare debugserver
-        sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "lldb-gdbserver")))
+        sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "..", "..", "lldb-server")))
         import lldbgdbserverutils
         debugserver_exe = lldbgdbserverutils.get_debugserver_exe()
         if not debugserver_exe:
diff --git a/lldb/test/tools/lldb-gdbserver/Makefile b/lldb/test/tools/lldb-server/Makefile
index d5b3e135723..d5b3e135723 100644
--- a/lldb/test/tools/lldb-gdbserver/Makefile
+++ b/lldb/test/tools/lldb-server/Makefile
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteAttach.py b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
index fd16f3f4681..fd16f3f4681 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteAttach.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteAuxvSupport.py b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index 152d6153529..152d6153529 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteAuxvSupport.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteExpeditedRegisters.py b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index bf4d0455161..bf4d0455161 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteKill.py b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
index 121093af36e..121093af36e 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteKill.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteProcessInfo.py b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 17209e2092a..17209e2092a 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteRegisterState.py b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index 895f73a9ce6..895f73a9ce6 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteRegisterState.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteSingleStep.py b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index ceb562b3541..ceb562b3541 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteSingleStep.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index ac0a3921d33..ac0a3921d33 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemote_qThreadStopInfo.py b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 18275030444..18275030444 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestGdbRemote_vCont.py b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
index 200024784d1..200024784d1 100644
--- a/lldb/test/tools/lldb-gdbserver/TestGdbRemote_vCont.py
+++ b/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
diff --git a/lldb/test/tools/lldb-gdbserver/TestLldbGdbServer.py b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
index 94ada4f417f..9e1ef34a1ff 100644
--- a/lldb/test/tools/lldb-gdbserver/TestLldbGdbServer.py
+++ b/lldb/test/tools/lldb-server/TestLldbGdbServer.py
@@ -1,8 +1,8 @@
 """
 Test case for testing the gdbremote protocol.
 
-Tests run against debugserver and lldb-gdbserver (llgs).
-lldb-gdbserver tests run where the lldb-gdbserver exe is
+Tests run against debugserver and lldb-server (llgs).
+lldb-server tests run where the lldb-server exe is
 available.
 
 This class will be broken into smaller test case classes by
@@ -52,8 +52,8 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
         self.add_no_ack_remote_stream()
         self.test_sequence.add_log_lines(
-            ["lldb-gdbserver <  26> read packet: $QThreadSuffixSupported#e4",
-             "lldb-gdbserver <   6> send packet: $OK#9a"],
+            ["lldb-server <  26> read packet: $QThreadSuffixSupported#e4",
+             "lldb-server <   6> send packet: $OK#9a"],
             True)
 
         self.expect_gdbremote_sequence()
@@ -74,8 +74,8 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
         self.add_no_ack_remote_stream()
         self.test_sequence.add_log_lines(
-            ["lldb-gdbserver <  27> read packet: $QListThreadsInStopReply#21",
-             "lldb-gdbserver <   6> send packet: $OK#9a"],
+            ["lldb-server <  27> read packet: $QListThreadsInStopReply#21",
+             "lldb-server <   6> send packet: $OK#9a"],
             True)
         self.expect_gdbremote_sequence()
 
@@ -95,7 +95,6 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
 
         # build launch args
         launch_args = [os.path.abspath('a.out')]
-
         self.add_no_ack_remote_stream()
         self.test_sequence.add_log_lines(
             ["read packet: %s" % lldbgdbserverutils.build_gdbremote_A_packet(launch_args),
diff --git a/lldb/test/tools/lldb-gdbserver/commandline/TestStubReverseConnect.py b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py
index 642cf19a381..642cf19a381 100644
--- a/lldb/test/tools/lldb-gdbserver/commandline/TestStubReverseConnect.py
+++ b/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py
diff --git a/lldb/test/tools/lldb-gdbserver/commandline/TestStubSetSID.py b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
index 65a4bb4ae3a..53b63959da3 100644
--- a/lldb/test/tools/lldb-gdbserver/commandline/TestStubSetSID.py
+++ b/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
@@ -29,7 +29,7 @@ class TestStubSetSIDTestCase(gdbremote_testcase.GdbRemoteTestCaseBase):
         server = self.launch_debug_monitor()
         self.assertIsNotNone(server)
         self.assertTrue(server.isalive())
-        server.expect("(debugserver|lldb-gdbserver)", timeout=10)
+        server.expect("(debugserver|lldb-server)", timeout=10)
 
         # Get the process id for the stub.
         return os.getsid(server.pid)
diff --git a/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py b/lldb/test/tools/lldb-server/gdbremote_testcase.py
index d2dc805154c..2ea0db920d1 100644
--- a/lldb/test/tools/lldb-gdbserver/gdbremote_testcase.py
+++ b/lldb/test/tools/lldb-server/gdbremote_testcase.py
@@ -134,9 +134,9 @@ class GdbRemoteTestCaseBase(TestBase):
         return stub_port
 
     def init_llgs_test(self, use_named_pipe=True):
-        self.debug_monitor_exe = get_lldb_gdbserver_exe()
+        self.debug_monitor_exe = get_lldb_server_exe()
         if not self.debug_monitor_exe:
-            self.skipTest("lldb_gdbserver exe not found")
+            self.skipTest("lldb-server exe not found")
         dname = os.path.join(os.environ["LLDB_TEST"],
                              os.environ["LLDB_SESSION_DIRNAME"])
         self.debug_monitor_extra_args = " gdbserver -c 'log enable -T -f {}/process-{}.log lldb break process thread' -c 'log enable -T -f {}/packets-{}.log gdb-remote packets'".format(dname, self.id(), dname, self.id())
@@ -161,7 +161,7 @@ class GdbRemoteTestCaseBase(TestBase):
         def shutdown_socket():
             if sock:
                 try:
-                    # send the kill packet so lldb-gdbserver shuts down gracefully
+                    # send the kill packet so lldb-server shuts down gracefully
                     sock.sendall(GdbRemoteTestCaseBase._GDBREMOTE_KILL_PACKET)
                 except:
                     logger.warning("failed to send kill packet to debug monitor: {}; ignoring".format(sys.exc_info()[0]))
@@ -204,7 +204,7 @@ class GdbRemoteTestCaseBase(TestBase):
         # Start the server.
         server = pexpect.spawn(commandline, logfile=logfile)
         self.assertIsNotNone(server)
-        server.expect(r"(debugserver|lldb-gdbserver)", timeout=10)
+        server.expect(r"(debugserver|lldb-server)", timeout=10)
 
         # If we're receiving the stub's listening port from the named pipe, do that here.
         if self.named_pipe:
diff --git a/lldb/test/tools/lldb-gdbserver/inferior-crash/Makefile b/lldb/test/tools/lldb-server/inferior-crash/Makefile
index 93052df3111..93052df3111 100644
--- a/lldb/test/tools/lldb-gdbserver/inferior-crash/Makefile
+++ b/lldb/test/tools/lldb-server/inferior-crash/Makefile
diff --git a/lldb/test/tools/lldb-gdbserver/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 16ca370f300..16ca370f300 100644
--- a/lldb/test/tools/lldb-gdbserver/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
diff --git a/lldb/test/tools/lldb-gdbserver/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index c7494bdb7ef..c7494bdb7ef 100644
--- a/lldb/test/tools/lldb-gdbserver/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
diff --git a/lldb/test/tools/lldb-gdbserver/inferior-crash/main.cpp b/lldb/test/tools/lldb-server/inferior-crash/main.cpp
index 69d60071aa4..69d60071aa4 100644
--- a/lldb/test/tools/lldb-gdbserver/inferior-crash/main.cpp
+++ b/lldb/test/tools/lldb-server/inferior-crash/main.cpp
diff --git a/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
index e49b0b284c6..b6f8f3925d3 100644
--- a/lldb/test/tools/lldb-gdbserver/lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/lldbgdbserverutils.py
@@ -1,4 +1,4 @@
-"""Module for supporting unit testing of the lldb-gdbserver debug monitor exe.
+"""Module for supporting unit testing of the lldb-server debug monitor exe.
 """
 
 import os
@@ -49,8 +49,8 @@ def _get_debug_monitor_from_lldb(lldb_exe, debug_monitor_basename):
         return None
 
 
-def get_lldb_gdbserver_exe():
-    """Return the lldb-gdbserver exe path.
+def get_lldb_server_exe():
+    """Return the lldb-server exe path.
 
     Returns:
         A path to the lldb-gdbserver exe if it is found to exist; otherwise,
@@ -86,7 +86,7 @@ def get_debugserver_exe():
         return None
 
 
-_LOG_LINE_REGEX = re.compile(r'^(lldb-gdbserver|debugserver)\s+<\s*(\d+)>' +
+_LOG_LINE_REGEX = re.compile(r'^(lldb-server|debugserver)\s+<\s*(\d+)>' +
     '\s+(read|send)\s+packet:\s+(.+)$')
 
 
@@ -831,8 +831,8 @@ def process_is_running(pid, unknown_value=True):
     return pid in process_ids
 
 if __name__ == '__main__':
-    EXE_PATH = get_lldb_gdbserver_exe()
+    EXE_PATH = get_lldb_server_exe()
     if EXE_PATH:
-        print "lldb-gdbserver path detected: {}".format(EXE_PATH)
+        print "lldb-server path detected: {}".format(EXE_PATH)
     else:
-        print "lldb-gdbserver could not be found"
+        print "lldb-server could not be found"
diff --git a/lldb/test/tools/lldb-gdbserver/main.cpp b/lldb/test/tools/lldb-server/main.cpp
index 2c38f475147..2c38f475147 100644
--- a/lldb/test/tools/lldb-gdbserver/main.cpp
+++ b/lldb/test/tools/lldb-server/main.cpp
diff --git a/lldb/test/tools/lldb-gdbserver/socket_packet_pump.py b/lldb/test/tools/lldb-server/socket_packet_pump.py
index 2d35898fd5d..2d35898fd5d 100644
--- a/lldb/test/tools/lldb-gdbserver/socket_packet_pump.py
+++ b/lldb/test/tools/lldb-server/socket_packet_pump.py
diff --git a/lldb/test/tools/lldb-gdbserver/test/test_lldbgdbserverutils.py b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
index 5442681a191..5442681a191 100644
--- a/lldb/test/tools/lldb-gdbserver/test/test_lldbgdbserverutils.py
+++ b/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py