https://github.com/JDevlieghere updated
https://github.com/llvm/llvm-project/pull/129110
>From 1e5b4a5b5ae47f1cd44611d2d8933c33ad04c709 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jo...@devlieghere.com>
Date: Thu, 27 Feb 2025 14:11:05 -0600
Subject: [PATCH 1/2] [lldb-dap] Adaptor -> Adapter (NFC)
Both spellings are considered correct and acceptable, with adapter being
more common in American English. Given that DAP stands for Debug Adapter
Protocol (with an e) let's go with that as the canonical spelling.
---
lldb/tools/lldb-dap/DAP.cpp | 2 +-
lldb/tools/lldb-dap/DAP.h | 2 +-
lldb/tools/lldb-dap/Handler/RequestHandler.cpp | 2 +-
lldb/tools/lldb-dap/JSONUtils.cpp | 4 ++--
lldb/tools/lldb-dap/JSONUtils.h | 16 ++++++++--------
lldb/tools/lldb-dap/Options.td | 2 +-
lldb/tools/lldb-dap/RunInTerminal.cpp | 4 ++--
lldb/tools/lldb-dap/RunInTerminal.h | 10 +++++-----
lldb/tools/lldb-dap/lldb-dap.cpp | 12 ++++++------
9 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/lldb/tools/lldb-dap/DAP.cpp b/lldb/tools/lldb-dap/DAP.cpp
index cd53e2aca3fb6..53c514b790f38 100644
--- a/lldb/tools/lldb-dap/DAP.cpp
+++ b/lldb/tools/lldb-dap/DAP.cpp
@@ -64,7 +64,7 @@ namespace lldb_dap {
DAP::DAP(std::string name, llvm::StringRef path, std::ofstream *log,
lldb::IOObjectSP input, lldb::IOObjectSP output, ReplMode repl_mode,
std::vector<std::string> pre_init_commands)
- : name(std::move(name)), debug_adaptor_path(path), log(log),
+ : name(std::move(name)), debug_adapter_path(path), log(log),
input(std::move(input)), output(std::move(output)),
broadcaster("lldb-dap"), exception_breakpoints(),
pre_init_commands(std::move(pre_init_commands)),
diff --git a/lldb/tools/lldb-dap/DAP.h b/lldb/tools/lldb-dap/DAP.h
index a7c7e5d9bbc19..8b2e498a28c95 100644
--- a/lldb/tools/lldb-dap/DAP.h
+++ b/lldb/tools/lldb-dap/DAP.h
@@ -146,7 +146,7 @@ struct SendEventRequestHandler : public
lldb::SBCommandPluginInterface {
struct DAP {
std::string name;
- llvm::StringRef debug_adaptor_path;
+ llvm::StringRef debug_adapter_path;
std::ofstream *log;
InputStream input;
OutputStream output;
diff --git a/lldb/tools/lldb-dap/Handler/RequestHandler.cpp
b/lldb/tools/lldb-dap/Handler/RequestHandler.cpp
index 0a32e39ea3aff..606ada90ce2e5 100644
--- a/lldb/tools/lldb-dap/Handler/RequestHandler.cpp
+++ b/lldb/tools/lldb-dap/Handler/RequestHandler.cpp
@@ -100,7 +100,7 @@ static llvm::Error RunInTerminal(DAP &dap,
debugger_pid = getpid();
#endif
llvm::json::Object reverse_request = CreateRunInTerminalReverseRequest(
- launch_request, dap.debug_adaptor_path, comm_file.m_path, debugger_pid);
+ launch_request, dap.debug_adapter_path, comm_file.m_path, debugger_pid);
dap.SendReverseRequest<LogFailureResponseHandler>("runInTerminal",
std::move(reverse_request));
diff --git a/lldb/tools/lldb-dap/JSONUtils.cpp
b/lldb/tools/lldb-dap/JSONUtils.cpp
index 9f08efb2a3ac1..9dec4ca1df49a 100644
--- a/lldb/tools/lldb-dap/JSONUtils.cpp
+++ b/lldb/tools/lldb-dap/JSONUtils.cpp
@@ -1436,7 +1436,7 @@ llvm::json::Value CreateCompileUnit(lldb::SBCompileUnit
&unit) {
///
https://microsoft.github.io/debug-adapter-protocol/specification#Reverse_Requests_RunInTerminal
llvm::json::Object
CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request,
- llvm::StringRef debug_adaptor_path,
+ llvm::StringRef debug_adapter_path,
llvm::StringRef comm_file,
lldb::pid_t debugger_pid) {
llvm::json::Object run_in_terminal_args;
@@ -1446,7 +1446,7 @@ CreateRunInTerminalReverseRequest(const
llvm::json::Object &launch_request,
const auto *launch_request_arguments = launch_request.getObject("arguments");
// The program path must be the first entry in the "args" field
- std::vector<std::string> args = {debug_adaptor_path.str(), "--comm-file",
+ std::vector<std::string> args = {debug_adapter_path.str(), "--comm-file",
comm_file.str()};
if (debugger_pid != LLDB_INVALID_PROCESS_ID) {
args.push_back("--debugger-pid");
diff --git a/lldb/tools/lldb-dap/JSONUtils.h b/lldb/tools/lldb-dap/JSONUtils.h
index db56d98777347..55d2360e0a224 100644
--- a/lldb/tools/lldb-dap/JSONUtils.h
+++ b/lldb/tools/lldb-dap/JSONUtils.h
@@ -233,7 +233,7 @@ void AppendBreakpoint(
std::optional<llvm::StringRef> request_path = std::nullopt,
std::optional<uint32_t> request_line = std::nullopt);
-/// Converts breakpoint location to a debug adaptor protocol "Breakpoint".
+/// Converts breakpoint location to a debug adapter protocol "Breakpoint".
///
/// \param[in] bp
/// A LLDB breakpoint object to convert into a JSON value
@@ -290,7 +290,7 @@ llvm::json::Value CreateModule(lldb::SBTarget &target,
lldb::SBModule &module);
llvm::json::Object CreateEventObject(const llvm::StringRef event_name);
/// Create a "ExceptionBreakpointsFilter" JSON object as described in
-/// the debug adaptor definition.
+/// the debug adapter definition.
///
/// \param[in] bp
/// The exception breakpoint object to use
@@ -301,7 +301,7 @@ llvm::json::Object CreateEventObject(const llvm::StringRef
event_name);
llvm::json::Value
CreateExceptionBreakpointFilter(const ExceptionBreakpoint &bp);
-/// Create a "Scope" JSON object as described in the debug adaptor definition.
+/// Create a "Scope" JSON object as described in the debug adapter definition.
///
/// \param[in] name
/// The value to place into the "name" key
@@ -322,7 +322,7 @@ llvm::json::Value CreateScope(const llvm::StringRef name,
int64_t variablesReference,
int64_t namedVariables, bool expensive);
-/// Create a "Source" JSON object as described in the debug adaptor definition.
+/// Create a "Source" JSON object as described in the debug adapter definition.
///
/// \param[in] file
/// The SBFileSpec to use when populating out the "Source" object
@@ -332,7 +332,7 @@ llvm::json::Value CreateScope(const llvm::StringRef name,
/// definition outlined by Microsoft.
llvm::json::Value CreateSource(const lldb::SBFileSpec &file);
-/// Create a "Source" JSON object as described in the debug adaptor definition.
+/// Create a "Source" JSON object as described in the debug adapter definition.
///
/// \param[in] line_entry
/// The LLDB line table to use when populating out the "Source"
@@ -573,8 +573,8 @@ llvm::json::Value CreateCompileUnit(lldb::SBCompileUnit
&unit);
/// The original launch_request object whose fields are used to construct
/// the reverse request object.
///
-/// \param[in] debug_adaptor_path
-/// Path to the current debug adaptor. It will be used to delegate the
+/// \param[in] debug_adapter_path
+/// Path to the current debug adapter. It will be used to delegate the
/// launch of the target.
///
/// \param[in] comm_file
@@ -590,7 +590,7 @@ llvm::json::Value CreateCompileUnit(lldb::SBCompileUnit
&unit);
/// Microsoft.
llvm::json::Object
CreateRunInTerminalReverseRequest(const llvm::json::Object &launch_request,
- llvm::StringRef debug_adaptor_path,
+ llvm::StringRef debug_adapter_path,
llvm::StringRef comm_file,
lldb::pid_t debugger_pid);
diff --git a/lldb/tools/lldb-dap/Options.td b/lldb/tools/lldb-dap/Options.td
index 97a6ec118c47b..a1baf2f0370bd 100644
--- a/lldb/tools/lldb-dap/Options.td
+++ b/lldb/tools/lldb-dap/Options.td
@@ -33,7 +33,7 @@ def launch_target: S<"launch-target">,
def comm_file: S<"comm-file">,
MetaVarName<"<file>">,
- HelpText<"The fifo file used to communicate the with the debug adaptor "
+ HelpText<"The fifo file used to communicate the with the debug adapter "
"when using --launch-target.">;
def debugger_pid: S<"debugger-pid">,
diff --git a/lldb/tools/lldb-dap/RunInTerminal.cpp
b/lldb/tools/lldb-dap/RunInTerminal.cpp
index 4fe09e2885a8e..9f309dd78221a 100644
--- a/lldb/tools/lldb-dap/RunInTerminal.cpp
+++ b/lldb/tools/lldb-dap/RunInTerminal.cpp
@@ -97,9 +97,9 @@ static Error ToError(const RunInTerminalMessage &message) {
RunInTerminalLauncherCommChannel::RunInTerminalLauncherCommChannel(
StringRef comm_file)
- : m_io(comm_file, "debug adaptor") {}
+ : m_io(comm_file, "debug adapter") {}
-Error RunInTerminalLauncherCommChannel::WaitUntilDebugAdaptorAttaches(
+Error RunInTerminalLauncherCommChannel::WaitUntilDebugAdapterAttaches(
std::chrono::milliseconds timeout) {
if (Expected<RunInTerminalMessageUP> message =
GetNextMessage(m_io, timeout)) {
diff --git a/lldb/tools/lldb-dap/RunInTerminal.h
b/lldb/tools/lldb-dap/RunInTerminal.h
index b20f8beb6071d..457850c8ea538 100644
--- a/lldb/tools/lldb-dap/RunInTerminal.h
+++ b/lldb/tools/lldb-dap/RunInTerminal.h
@@ -72,7 +72,7 @@ class RunInTerminalLauncherCommChannel {
public:
RunInTerminalLauncherCommChannel(llvm::StringRef comm_file);
- /// Wait until the debug adaptor attaches.
+ /// Wait until the debug adapter attaches.
///
/// \param[in] timeout
/// How long to wait to be attached.
@@ -80,16 +80,16 @@ class RunInTerminalLauncherCommChannel {
/// \return
/// An \a llvm::Error object in case of errors or if this operation times
/// out.
- llvm::Error WaitUntilDebugAdaptorAttaches(std::chrono::milliseconds timeout);
+ llvm::Error WaitUntilDebugAdapterAttaches(std::chrono::milliseconds timeout);
- /// Notify the debug adaptor this process' pid.
+ /// Notify the debug adapter this process' pid.
///
/// \return
/// An \a llvm::Error object in case of errors or if this operation times
/// out.
llvm::Error NotifyPid();
- /// Notify the debug adaptor that there's been an error.
+ /// Notify the debug adapter that there's been an error.
void NotifyError(llvm::StringRef error);
private:
@@ -122,7 +122,7 @@ class RunInTerminalDebugAdapterCommChannel {
FifoFileIO m_io;
};
-/// Create a fifo file used to communicate the debug adaptor with
+/// Create a fifo file used to communicate the debug adapter with
/// the runInTerminal launcher.
llvm::Expected<std::shared_ptr<FifoFile>> CreateRunInTerminalCommFile();
diff --git a/lldb/tools/lldb-dap/lldb-dap.cpp b/lldb/tools/lldb-dap/lldb-dap.cpp
index 6dff960daede9..d005eccfae903 100644
--- a/lldb/tools/lldb-dap/lldb-dap.cpp
+++ b/lldb/tools/lldb-dap/lldb-dap.cpp
@@ -175,22 +175,22 @@ static void PrintHelp(LLDBDAPOptTable &table,
llvm::StringRef tool_name) {
// If --launch-target is provided, this instance of lldb-dap becomes a
// runInTerminal launcher. It will ultimately launch the program specified in
// the --launch-target argument, which is the original program the user wanted
-// to debug. This is done in such a way that the actual debug adaptor can
+// to debug. This is done in such a way that the actual debug adapter can
// place breakpoints at the beginning of the program.
//
-// The launcher will communicate with the debug adaptor using a fifo file in
the
+// The launcher will communicate with the debug adapter using a fifo file in
the
// directory specified in the --comm-file argument.
//
-// Regarding the actual flow, this launcher will first notify the debug adaptor
+// Regarding the actual flow, this launcher will first notify the debug adapter
// of its pid. Then, the launcher will be in a pending state waiting to be
-// attached by the adaptor.
+// attached by the adapter.
//
// Once attached and resumed, the launcher will exec and become the program
// specified by --launch-target, which is the original target the
// user wanted to run.
//
// In case of errors launching the target, a suitable error message will be
-// emitted to the debug adaptor.
+// emitted to the debug adapter.
static llvm::Error LaunchRunInTerminalTarget(llvm::opt::Arg &target_arg,
llvm::StringRef comm_file,
lldb::pid_t debugger_pid,
@@ -219,7 +219,7 @@ static llvm::Error LaunchRunInTerminalTarget(llvm::opt::Arg
&target_arg,
const char *timeout_env_var = getenv("LLDB_DAP_RIT_TIMEOUT_IN_MS");
int timeout_in_ms =
timeout_env_var != nullptr ? atoi(timeout_env_var) : 20000;
- if (llvm::Error err = comm_channel.WaitUntilDebugAdaptorAttaches(
+ if (llvm::Error err = comm_channel.WaitUntilDebugAdapterAttaches(
std::chrono::milliseconds(timeout_in_ms))) {
return err;
}
>From de5627a42017b8336fc040f3a97640a587e13d66 Mon Sep 17 00:00:00 2001
From: Jonas Devlieghere <jo...@devlieghere.com>
Date: Thu, 27 Feb 2025 14:24:32 -0600
Subject: [PATCH 2/2] Adaptor -> Adapter in the tests
---
.../Python/lldbsuite/test/test_categories.py | 2 +-
.../test/tools/lldb-dap/dap_server.py | 34 +++++++++----------
.../test/tools/lldb-dap/lldbdap_testcase.py | 18 +++++-----
.../tools/lldb-dap/attach/TestDAP_attach.py | 10 +++---
.../attach/TestDAP_attachByPortNum.py | 8 ++---
.../TestDAP_breakpointEvents.py | 2 +-
.../breakpoint/TestDAP_setBreakpoints.py | 8 ++---
.../TestDAP_setExceptionBreakpoints.py | 4 +--
.../TestDAP_setFunctionBreakpoints.py | 4 +--
.../lldb-dap/commands/TestDAP_commands.py | 2 +-
.../lldb-dap/coreFile/TestDAP_coreFile.py | 6 ++--
.../lldb-dap/disconnect/TestDAP_disconnect.py | 2 +-
.../tools/lldb-dap/launch/TestDAP_launch.py | 10 +++---
.../runInTerminal/TestDAP_runInTerminal.py | 4 +--
.../tools/lldb-dap/server/TestDAP_server.py | 6 ++--
.../lldb-dap/variables/TestDAP_variables.py | 2 +-
16 files changed, 61 insertions(+), 61 deletions(-)
diff --git a/lldb/packages/Python/lldbsuite/test/test_categories.py
b/lldb/packages/Python/lldbsuite/test/test_categories.py
index 036bda9c957d1..b585f695adeab 100644
--- a/lldb/packages/Python/lldbsuite/test/test_categories.py
+++ b/lldb/packages/Python/lldbsuite/test/test_categories.py
@@ -31,7 +31,7 @@
"libc++": "Test for libc++ data formatters",
"libstdcxx": "Test for libstdcxx data formatters",
"lldb-server": "Tests related to lldb-server",
- "lldb-dap": "Tests for the Debug Adaptor Protocol with lldb-dap",
+ "lldb-dap": "Tests for the Debug Adapter Protocol with lldb-dap",
"llgs": "Tests for the gdb-server functionality of lldb-server",
"pexpect": "Tests requiring the pexpect library to be available",
"objc": "Tests related to the Objective-C programming language support",
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
index 391378cf027bc..9471594b66012 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/dap_server.py
@@ -76,7 +76,7 @@ def read_packet(f, verbose=False, trace_file=None):
if verbose:
print('json: "%s"' % (json_str))
if trace_file:
- trace_file.write("from adaptor:\n%s\n" % (json_str))
+ trace_file.write("from adapter:\n%s\n" % (json_str))
# Decode the JSON bytes into a python dictionary
return json.loads(json_str)
@@ -259,7 +259,7 @@ def handle_recv_packet(self, packet):
def send_packet(self, command_dict, set_sequence=True):
"""Take the "command_dict" python dictionary and encode it as a JSON
string and send the contents as a packet to the VSCode debug
- adaptor"""
+ adapter"""
# Set the sequence ID for this command automatically
if set_sequence:
command_dict["seq"] = self.sequence
@@ -267,7 +267,7 @@ def send_packet(self, command_dict, set_sequence=True):
# Encode our command dictionary as a JSON string
json_str = json.dumps(command_dict, separators=(",", ":"))
if self.trace_file:
- self.trace_file.write("to adaptor:\n%s\n" % (json_str))
+ self.trace_file.write("to adapter:\n%s\n" % (json_str))
length = len(json_str)
if length > 0:
# Send the encoded JSON packet and flush the 'send' file
@@ -275,7 +275,7 @@ def send_packet(self, command_dict, set_sequence=True):
self.send.flush()
def recv_packet(self, filter_type=None, filter_event=None, timeout=None):
- """Get a JSON packet from the VSCode debug adaptor. This function
+ """Get a JSON packet from the VSCode debug adapter. This function
assumes a thread that reads packets is running and will deliver
any received packets by calling handle_recv_packet(...). This
function will wait for the packet to arrive and return it when
@@ -1184,7 +1184,7 @@ def request_setInstructionBreakpoints(self,
memory_reference=[]):
return self.send_recv(command_dict)
-class DebugAdaptorServer(DebugCommunication):
+class DebugAdapterServer(DebugCommunication):
def __init__(
self,
executable=None,
@@ -1196,7 +1196,7 @@ def __init__(
self.process = None
self.connection = None
if executable is not None:
- process, connection = DebugAdaptorServer.launch(
+ process, connection = DebugAdapterServer.launch(
executable=executable, connection=connection, env=env,
log_file=log_file
)
self.process = process
@@ -1224,12 +1224,12 @@ def __init__(
@classmethod
def launch(cls, /, executable, env=None, log_file=None, connection=None):
- adaptor_env = os.environ.copy()
+ adapter_env = os.environ.copy()
if env is not None:
- adaptor_env.update(env)
+ adapter_env.update(env)
if log_file:
- adaptor_env["LLDBDAP_LOG"] = log_file
+ adapter_env["LLDBDAP_LOG"] = log_file
args = [executable]
if connection is not None:
@@ -1241,7 +1241,7 @@ def launch(cls, /, executable, env=None, log_file=None,
connection=None):
stdin=subprocess.PIPE,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
- env=adaptor_env,
+ env=adapter_env,
)
if connection is None:
@@ -1271,7 +1271,7 @@ def get_pid(self):
return -1
def terminate(self):
- super(DebugAdaptorServer, self).terminate()
+ super(DebugAdapterServer, self).terminate()
if self.process is not None:
self.process.terminate()
self.process.wait()
@@ -1347,7 +1347,7 @@ def run_vscode(dbg, args, options):
def main():
parser = optparse.OptionParser(
description=(
- "A testing framework for the Visual Studio Code Debug Adaptor
protocol"
+ "A testing framework for the Visual Studio Code Debug Adapter
protocol"
)
)
@@ -1357,7 +1357,7 @@ def main():
dest="vscode_path",
help=(
"The path to the command line program that implements the "
- "Visual Studio Code Debug Adaptor protocol."
+ "Visual Studio Code Debug Adapter protocol."
),
default=None,
)
@@ -1407,7 +1407,7 @@ def main():
dest="replay",
help=(
"Specify a file containing a packet log to replay with the "
- "current Visual Studio Code Debug Adaptor executable."
+ "current Visual Studio Code Debug Adapter executable."
),
default=None,
)
@@ -1418,7 +1418,7 @@ def main():
action="store_true",
dest="debug",
default=False,
- help="Pause waiting for a debugger to attach to the debug adaptor",
+ help="Pause waiting for a debugger to attach to the debug adapter",
)
parser.add_option(
@@ -1581,11 +1581,11 @@ def main():
if options.vscode_path is None and options.connection is None:
print(
"error: must either specify a path to a Visual Studio Code "
- "Debug Adaptor vscode executable path using the --vscode "
+ "Debug Adapter vscode executable path using the --vscode "
"option, or using the --connection option"
)
return
- dbg = DebugAdaptorServer(
+ dbg = DebugAdapterServer(
executable=options.vscode_path, connection=options.connection
)
if options.debug:
diff --git
a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py
b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py
index 8b0f74ba389c3..70b04b051e0ec 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-dap/lldbdap_testcase.py
@@ -14,13 +14,13 @@ class DAPTestCaseBase(TestBase):
timeoutval = 10 * (10 if ("ASAN_OPTIONS" in os.environ) else 1)
NO_DEBUG_INFO_TESTCASE = True
- def create_debug_adaptor(self, lldbDAPEnv=None, connection=None):
- """Create the Visual Studio Code debug adaptor"""
+ def create_debug_adapter(self, lldbDAPEnv=None, connection=None):
+ """Create the Visual Studio Code debug adapter"""
self.assertTrue(
is_exe(self.lldbDAPExec), "lldb-dap must exist and be executable"
)
log_file_path = self.getBuildArtifact("dap.txt")
- self.dap_server = dap_server.DebugAdaptorServer(
+ self.dap_server = dap_server.DebugAdapterServer(
executable=self.lldbDAPExec,
connection=connection,
init_commands=self.setUpCommands(),
@@ -28,9 +28,9 @@ def create_debug_adaptor(self, lldbDAPEnv=None,
connection=None):
env=lldbDAPEnv,
)
- def build_and_create_debug_adaptor(self, lldbDAPEnv=None):
+ def build_and_create_debug_adapter(self, lldbDAPEnv=None):
self.build()
- self.create_debug_adaptor(lldbDAPEnv)
+ self.create_debug_adapter(lldbDAPEnv)
def set_source_breakpoints(self, source_path, lines, data=None):
"""Sets source breakpoints and returns an array of strings containing
@@ -324,11 +324,11 @@ def attach(
gdbRemotePort=None,
gdbRemoteHostname=None,
):
- """Build the default Makefile target, create the DAP debug adaptor,
+ """Build the default Makefile target, create the DAP debug adapter,
and attach to the process.
"""
- # Make sure we disconnect and terminate the DAP debug adaptor even
+ # Make sure we disconnect and terminate the DAP debug adapter even
# if we throw an exception during the test case.
def cleanup():
if disconnectAutomatically:
@@ -479,10 +479,10 @@ def build_and_launch(
launchCommands=None,
expectFailure=False,
):
- """Build the default Makefile target, create the DAP debug adaptor,
+ """Build the default Makefile target, create the DAP debug adapter,
and launch the process.
"""
- self.build_and_create_debug_adaptor(lldbDAPEnv)
+ self.build_and_create_debug_adapter(lldbDAPEnv)
self.assertTrue(os.path.exists(program), "executable must exist")
return self.launch(
diff --git a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
index e143c2798b209..9df44cc454d5d 100644
--- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
+++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attach.py
@@ -44,7 +44,7 @@ def test_by_pid(self):
"""
Tests attaching to a process by process ID.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
self.process = subprocess.Popen(
[program],
@@ -60,7 +60,7 @@ def test_by_name(self):
"""
Tests attaching to a process by process name.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
orig_program = self.getBuildArtifact("a.out")
# Since we are going to attach by process name, we need a unique
# process name that has minimal chance to match a process that is
@@ -101,7 +101,7 @@ def test_by_name_waitFor(self):
next instance of a process to be launched, ingoring all current
ones.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
self.spawn_thread = threading.Thread(
target=spawn_and_wait,
@@ -137,7 +137,7 @@ def test_commands(self):
"terminateCommands" are a list of LLDB commands that get executed when
the debugger session terminates.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
# Here we just create a target and launch the process as a way to test
# if we are able to use attach commands to create any kind of a target
@@ -211,7 +211,7 @@ def test_terminate_commands(self):
Tests that the "terminateCommands", that can be passed during
attach, are run when the debugger is disconnected.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
# Here we just create a target and launch the process as a way to test
# if we are able to use attach commands to create any kind of a target
diff --git a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
index fbabc857bd0e0..9024120c868fd 100644
--- a/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
+++ b/lldb/test/API/tools/lldb-dap/attach/TestDAP_attachByPortNum.py
@@ -60,7 +60,7 @@ def test_by_port(self):
"""
Tests attaching to a process by port.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
debug_server_tool = self.getBuiltinDebugServerTool()
@@ -92,7 +92,7 @@ def test_by_port_and_pid(self):
"""
Tests attaching to a process by process ID and port number.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
# It is not necessary to launch "lldb-server" to obtain the actual
port and pid for attaching.
@@ -120,7 +120,7 @@ def test_by_invalid_port(self):
"""
Tests attaching to a process by invalid port number 0.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
port = 0
@@ -139,7 +139,7 @@ def test_by_illegal_port(self):
"""
Tests attaching to a process by illegal/greater port number 65536
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
port = 65536
diff --git
a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
index a20384b75f5c0..11573eba06907 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py
@@ -41,7 +41,7 @@ def test_breakpoint_events(self):
foo_bp1_line = line_number("foo.cpp", "foo breakpoint 1")
foo_bp2_line = line_number("foo.cpp", "foo breakpoint 2")
- # Visual Studio Code Debug Adaptors have no way to specify the file
+ # Visual Studio Code Debug Adapters have no way to specify the file
# without launching or attaching to a process, so we must start a
# process in order to be able to set breakpoints.
program = self.getBuildArtifact("a.out")
diff --git a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
index c62feda64a125..26df2573555df 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setBreakpoints.py
@@ -27,7 +27,7 @@ def test_source_map(self):
with the corresponding source maps to have breakpoints and frames
working.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
other_basename = "other-copy.c"
other_path = self.getBuildArtifact(other_basename)
@@ -100,7 +100,7 @@ def test_source_map(self):
@skipIfWindows
def test_set_and_clear(self):
"""Tests setting and clearing source file and line breakpoints.
- This packet is a bit tricky on the debug adaptor side since there
+ This packet is a bit tricky on the debug adapter side since there
is no "clearBreakpoints" packet. Source file and line breakpoints
are set by sending a "setBreakpoints" packet with a source file
specified and zero or more source lines. If breakpoints have been
@@ -116,7 +116,7 @@ def test_set_and_clear(self):
third_line = line_number("main.cpp", "break 14")
lines = [first_line, third_line, second_line]
- # Visual Studio Code Debug Adaptors have no way to specify the file
+ # Visual Studio Code Debug Adapters have no way to specify the file
# without launching or attaching to a process, so we must start a
# process in order to be able to set breakpoints.
program = self.getBuildArtifact("a.out")
@@ -257,7 +257,7 @@ def test_clear_breakpoints_unset_breakpoints(self):
line_number("main.cpp", "break 13"),
]
- # Visual Studio Code Debug Adaptors have no way to specify the file
+ # Visual Studio Code Debug Adapters have no way to specify the file
# without launching or attaching to a process, so we must start a
# process in order to be able to set breakpoints.
program = self.getBuildArtifact("a.out")
diff --git
a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
index b2ab12e51bf68..92ac66cd44c5d 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setExceptionBreakpoints.py
@@ -14,7 +14,7 @@ class
TestDAP_setExceptionBreakpoints(lldbdap_testcase.DAPTestCaseBase):
@skipIfWindows
def test_functionality(self):
"""Tests setting and clearing exception breakpoints.
- This packet is a bit tricky on the debug adaptor side since there
+ This packet is a bit tricky on the debug adapter side since there
is no "clear exception breakpoints" packet. Exception breakpoints
are set by sending a "setExceptionBreakpoints" packet with zero or
more exception filters. If exception breakpoints have been set
@@ -26,7 +26,7 @@ def test_functionality(self):
and the functionality of each breakpoint, like 'conditions' and
x'hitCondition' settings.
"""
- # Visual Studio Code Debug Adaptors have no way to specify the file
+ # Visual Studio Code Debug Adapters have no way to specify the file
# without launching or attaching to a process, so we must start a
# process in order to be able to set breakpoints.
program = self.getBuildArtifact("a.out")
diff --git
a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
index 8f00f42574b56..946595f639edc 100644
--- a/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
+++ b/lldb/test/API/tools/lldb-dap/breakpoint/TestDAP_setFunctionBreakpoints.py
@@ -14,7 +14,7 @@ class
TestDAP_setFunctionBreakpoints(lldbdap_testcase.DAPTestCaseBase):
@skipIfWindows
def test_set_and_clear(self):
"""Tests setting and clearing function breakpoints.
- This packet is a bit tricky on the debug adaptor side since there
+ This packet is a bit tricky on the debug adapter side since there
is no "clearFunction Breakpoints" packet. Function breakpoints
are set by sending a "setFunctionBreakpoints" packet with zero or
more function names. If function breakpoints have been set before,
@@ -25,7 +25,7 @@ def test_set_and_clear(self):
correctly. It doesn't test hitting breakpoints and the functionality
of each breakpoint, like 'conditions' and 'hitCondition' settings.
"""
- # Visual Studio Code Debug Adaptors have no way to specify the file
+ # Visual Studio Code Debug Adapters have no way to specify the file
# without launching or attaching to a process, so we must start a
# process in order to be able to set breakpoints.
program = self.getBuildArtifact("a.out")
diff --git a/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
b/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
index e4cf903fc0d11..25ecbb5cf106b 100644
--- a/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
+++ b/lldb/test/API/tools/lldb-dap/commands/TestDAP_commands.py
@@ -75,7 +75,7 @@ def
test_command_directive_abort_on_error_attach_commands(self):
"settings set target.show-hex-variable-values-with-leading-zeroes
false"
)
command_abort_on_error = "settings set foo bar"
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
self.attach(
program,
attachCommands=["?!" + command_quiet, "!" +
command_abort_on_error],
diff --git a/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py
b/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py
index 5189435185607..1896acea15a99 100644
--- a/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py
+++ b/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py
@@ -18,7 +18,7 @@ def test_core_file(self):
exe_file = os.path.join(current_dir, "linux-x86_64.out")
core_file = os.path.join(current_dir, "linux-x86_64.core")
- self.create_debug_adaptor()
+ self.create_debug_adapter()
self.attach(exe_file, coreFile=core_file)
expected_frames = [
@@ -64,7 +64,7 @@ def test_core_file_source_mapping_array(self):
exe_file = os.path.join(current_dir, "linux-x86_64.out")
core_file = os.path.join(current_dir, "linux-x86_64.core")
- self.create_debug_adaptor()
+ self.create_debug_adapter()
source_map = [["/home/labath/test", current_dir]]
self.attach(exe_file, coreFile=core_file, sourceMap=source_map)
@@ -78,7 +78,7 @@ def test_core_file_source_mapping_object(self):
exe_file = os.path.join(current_dir, "linux-x86_64.out")
core_file = os.path.join(current_dir, "linux-x86_64.core")
- self.create_debug_adaptor()
+ self.create_debug_adapter()
source_map = {"/home/labath/test": current_dir}
self.attach(exe_file, coreFile=core_file, sourceMap=source_map)
diff --git a/lldb/test/API/tools/lldb-dap/disconnect/TestDAP_disconnect.py
b/lldb/test/API/tools/lldb-dap/disconnect/TestDAP_disconnect.py
index f9e461adecb15..0cb792d662a80 100644
--- a/lldb/test/API/tools/lldb-dap/disconnect/TestDAP_disconnect.py
+++ b/lldb/test/API/tools/lldb-dap/disconnect/TestDAP_disconnect.py
@@ -52,7 +52,7 @@ def test_attach(self):
before the file is created, and as the process is not terminated upon
disconnection,
the file is created anyway.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
# Use a file as a synchronization point between test and inferior.
diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py
b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py
index 7898d01457afc..0c92e5bff07c6 100644
--- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py
+++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py
@@ -32,7 +32,7 @@ def test_termination(self):
Tests the correct termination of lldb-dap upon a 'disconnect'
request.
"""
- self.create_debug_adaptor()
+ self.create_debug_adapter()
# The underlying lldb-dap process must be alive
self.assertEqual(self.dap_server.process.poll(), None)
@@ -92,7 +92,7 @@ def test_cwd(self):
def test_debuggerRoot(self):
"""
Tests the "debuggerRoot" will change the working directory of
- the lldb-dap debug adaptor.
+ the lldb-dap debug adapter.
"""
program = self.getBuildArtifact("a.out")
program_parent_dir =
os.path.realpath(os.path.dirname(os.path.dirname(program)))
@@ -376,7 +376,7 @@ def test_extra_launch_commands(self):
"""
Tests the "launchCommands" with extra launching settings
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
source = "main.c"
@@ -440,7 +440,7 @@ def test_failing_launch_commands(self):
"""
Tests "launchCommands" failures prevents a launch.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
# Run an invalid launch command, in this case a bad path.
@@ -483,7 +483,7 @@ def test_terminate_commands(self):
Tests that the "terminateCommands", that can be passed during
launch, are run when the debugger is disconnected.
"""
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
terminateCommands = ["expr 4+2"]
diff --git
a/lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
b/lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
index ac96bcc1364a2..9141565ac1b9b 100644
--- a/lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
+++ b/lldb/test/API/tools/lldb-dap/runInTerminal/TestDAP_runInTerminal.py
@@ -118,7 +118,7 @@ def test_runInTerminalWithObjectEnv(self):
def test_runInTerminalInvalidTarget(self):
if not self.isTestSupported():
return
- self.build_and_create_debug_adaptor()
+ self.build_and_create_debug_adapter()
response = self.launch(
"INVALIDPROGRAM",
runInTerminal=True,
@@ -247,4 +247,4 @@ def test_NonAttachedRunInTerminalLauncher(self):
self.readPidMessage(comm_file)
_, stderr = proc.communicate()
- self.assertIn("Timed out trying to get messages from the debug
adaptor", stderr)
+ self.assertIn("Timed out trying to get messages from the debug
adapter", stderr)
diff --git a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
index 1f562e989533a..7a9a4f434e04b 100644
--- a/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
+++ b/lldb/test/API/tools/lldb-dap/server/TestDAP_server.py
@@ -15,7 +15,7 @@
class TestDAP_server(lldbdap_testcase.DAPTestCaseBase):
def start_server(self, connection):
log_file_path = self.getBuildArtifact("dap.txt")
- (process, connection) = dap_server.DebugAdaptorServer.launch(
+ (process, connection) = dap_server.DebugAdapterServer.launch(
executable=self.lldbDAPExec,
connection=connection,
log_file=log_file_path,
@@ -29,7 +29,7 @@ def cleanup():
return (process, connection)
def run_debug_session(self, connection, name):
- self.dap_server = dap_server.DebugAdaptorServer(
+ self.dap_server = dap_server.DebugAdapterServer(
connection=connection,
)
program = self.getBuildArtifact("a.out")
@@ -83,7 +83,7 @@ def test_server_interrupt(self):
"""
self.build()
(process, connection) =
self.start_server(connection="tcp://localhost:0")
- self.dap_server = dap_server.DebugAdaptorServer(
+ self.dap_server = dap_server.DebugAdapterServer(
connection=connection,
)
program = self.getBuildArtifact("a.out")
diff --git a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
index 580ad38ab51c1..fde66a28382c7 100644
--- a/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
+++ b/lldb/test/API/tools/lldb-dap/variables/TestDAP_variables.py
@@ -113,7 +113,7 @@ def darwin_dwarf_missing_obj(self, initCommands):
# error when we run to main and try to get variables
os.unlink(main_obj)
- self.create_debug_adaptor()
+ self.create_debug_adapter()
self.assertTrue(os.path.exists(program), "executable must exist")
self.launch(program=program, initCommands=initCommands)
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
