================
@@ -4,81 +4,75 @@
from lldbsuite.test.decorators import skipIf
from lldbsuite.test.lldbtest import line_number
-import lldbdap_testcase
+from lldbsuite.test.tools.lldb_dap.dap_types import LaunchArgs
+from lldbsuite.test.tools.lldb_dap.lldb_dap_testcase import DAPTestCaseBase
-class TestDAP_launch_extra_launch_commands(lldbdap_testcase.DAPTestCaseBase):
+class TestDAP_launch_extra_launch_commands(DAPTestCaseBase):
"""
Tests the "launchCommands" with extra launching settings
"""
# Flakey on 32-bit Arm Linux.
@skipIf(oslist=["linux"], archs=["arm$"])
def test(self):
- self.build_and_create_debug_adapter()
program = self.getBuildArtifact("a.out")
-
- source = "main.c"
+ session = self.build_and_create_session()
+ source = self.getSourcePath("main.c")
first_line = line_number(source, "// breakpoint 1")
second_line = line_number(source, "// breakpoint 2")
- # Set target binary and 2 breakpoints
- # then we can verify the "launchCommands" get run
- # also we can verify that "stopCommands" get run as the
- # breakpoints get hit
+
+ # Set target binary and 2 breakpoints, so we can verify the
+ # "launchCommands" get run, and verify "stopCommands" get run
+ # as the breakpoints get hit.
launchCommands = [
- 'target create "%s"' % (program),
+ f'target create "{program}"',
"process launch --stop-at-entry",
]
initCommands = ["target list", "platform list"]
preRunCommands = ["image list a.out", "image dump sections a.out"]
postRunCommands = ['script print("hello world")']
stopCommands = ["frame variable", "bt"]
exitCommands = ["expr 2+3", "expr 3+4"]
- self.launch(
- program,
- initCommands=initCommands,
- preRunCommands=preRunCommands,
- postRunCommands=postRunCommands,
- stopCommands=stopCommands,
- exitCommands=exitCommands,
- launchCommands=launchCommands,
- )
- self.set_source_breakpoints("main.c", [first_line, second_line])
-
- # Get output from the console. This should contain both the
- # "initCommands" and the "preRunCommands".
- output = self.get_console()
- # Verify all "initCommands" were found in console output
- self.verify_commands("initCommands", output, initCommands)
- # Verify all "preRunCommands" were found in console output
- self.verify_commands("preRunCommands", output, preRunCommands)
-
- # Verify all "launchCommands" were found in console output
- # After execution, program should launch
- self.verify_commands("launchCommands", output, launchCommands)
- self.verify_commands("postRunCommands", output, postRunCommands)
- # Finish configuration and continue target
- self.verify_configuration_done()
+ with session.configure(
+ LaunchArgs(
+ program=program,
+ launchCommands=launchCommands,
+ initCommands=initCommands,
+ preRunCommands=preRunCommands,
+ postRunCommands=postRunCommands,
+ stopCommands=stopCommands,
+ exitCommands=exitCommands,
+ )
+ ) as ctx:
+ session.resolve_source_breakpoints(source, [first_line,
second_line])
+ process_event = ctx.process_event
+ # The launchCommands stop the process at entry, but lldb-dap
auto-continues
+ # after configurationDone (since stopOnEntry isn't set), so the first
+ # observable stop is hitting the first breakpoint, not entry.
+ first_stop = session.verify_stopped_on_breakpoint(after=process_event)
- # Check that we got module events from target
- modules = self.dap_server.wait_for_module_events()
- self.assertGreater(len(modules), 0)
----------------
DrSergei wrote:
Looks like this check is missed in new version
https://github.com/llvm/llvm-project/pull/207023
_______________________________________________
lldb-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
