diff --git a/lldb/source/Interpreter/CommandInterpreter.cpp b/lldb/source/Interpreter/CommandInterpreter.cpp index d7fe97077cb34..6e38f3b7dc3ad 100644 --- a/lldb/source/Interpreter/CommandInterpreter.cpp +++ b/lldb/source/Interpreter/CommandInterpreter.cpp @@ -468,6 +468,12 @@ void CommandInterpreter::Initialize() { #endif } +#ifdef LLDB_ENABLE_SWIFT + cmd_obj_sp = GetCommandSPExact("language swift task"); + if (cmd_obj_sp) + AddAlias("task", cmd_obj_sp); +#endif + cmd_obj_sp = GetCommandSPExact("platform shell"); if (cmd_obj_sp) { CommandAlias *shell_alias = AddAlias("shell", cmd_obj_sp, " --host --"); diff --git a/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py index 1a7eb4a0413b6..0432af43c33ba 100644 --- a/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py +++ b/lldb/test/API/functionalities/abbreviation/TestCommonShortSpellings.py @@ -22,10 +22,10 @@ def test_abbrevs2(self): ("disp", "_regexp-display"), # a.k.a., 'display' ("di", "disassemble"), ("dis", "disassemble"), - ("ta st a", "target stop-hook add"), + ("tar st a", "target stop-hook add"), ("fr v", "frame variable"), ("f 1", "frame select 1"), - ("ta st li", "target stop-hook list"), + ("tar st li", "target stop-hook list"), ] for short_val, long_val in abbrevs: diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py index 958adc768fe53..e2418e18f4969 100644 --- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py +++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskBacktrace.py @@ -25,7 +25,7 @@ def test_backtrace_task_address(self): def do_backtrace(self, arg): self.expect( - f"language swift task backtrace {arg}", + f"task backtrace {arg}", substrs=[ ".sleep(", "`second() at main.swift:6", diff --git a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py index cf1c620ce64c3..3813ec65774a2 100644 --- a/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py +++ b/lldb/test/API/lang/swift/async/tasks/TestSwiftTaskSelect.py @@ -24,7 +24,7 @@ def test_backtrace_selected_task_address(self): self.do_backtrace_selected_task(task_addr) def do_backtrace_selected_task(self, arg): - self.runCmd(f"language swift task select {arg}") + self.runCmd(f"task select {arg}") self.expect( "thread backtrace", substrs=[ @@ -53,7 +53,7 @@ def test_navigate_stack_of_selected_task_address(self): self.do_test_navigate_selected_task_stack(process, task_addr) def do_test_navigate_selected_task_stack(self, process, arg): - self.runCmd(f"language swift task select {arg}") + self.runCmd(f"task select {arg}") thread = process.GetSelectedThread() self.assertIn( diff --git a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py index 3416ef9b91a98..b67e323f6fe3a 100644 --- a/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py +++ b/lldb/test/API/lang/swift/async/tasks/info/TestSwiftTaskInfo.py @@ -23,7 +23,7 @@ def test_compare_printed_task_variable_to_task_info(self): ) self.runCmd("frame variable task") frame_variable_output = self.res.GetOutput() - self.runCmd("language swift task info") + self.runCmd("task info") task_info_output = self.res.GetOutput() self.assertEqual(_tail(task_info_output), _tail(frame_variable_output)) @@ -41,6 +41,6 @@ def test_compare_printed_task_variable_to_task_info_with_address(self): self.runCmd("frame variable task") frame_variable_output = self.res.GetOutput() - self.runCmd(f"language swift task info {task_addr}") + self.runCmd(f"task info {task_addr}") task_info_output = self.res.GetOutput() self.assertEqual(_tail(task_info_output), _tail(frame_variable_output)) diff --git a/lldb/test/API/lang/swift/dwarfimporter/BridgingPCH/TestSwiftDWARFImporterBridgingPCH.py b/lldb/test/API/lang/swift/dwarfimporter/BridgingPCH/TestSwiftDWARFImporterBridgingPCH.py index 5bc5a8a343db3..4facb899b42af 100644 --- a/lldb/test/API/lang/swift/dwarfimporter/BridgingPCH/TestSwiftDWARFImporterBridgingPCH.py +++ b/lldb/test/API/lang/swift/dwarfimporter/BridgingPCH/TestSwiftDWARFImporterBridgingPCH.py @@ -53,12 +53,15 @@ def test_dwarf_importer(self): lldbutil.check_variable(self, target.FindFirstGlobalVariable("point"), typename='bridging-header.h.Point', num_children=2) - self.expect("ta v -d no-dyn point", substrs=["x = 1", "y = 2"]) - self.expect("ta v -d no-dyn swiftStructCMember", - substrs=[ - # FIXME: This doesn't even work with the original bridging header! - #"point", "x = 3", "y = 4", - "swift struct c member"]) + self.expect("tar v -d no-dyn point", substrs=["x = 1", "y = 2"]) + self.expect( + "tar v -d no-dyn swiftStructCMember", + substrs=[ + # FIXME: This doesn't even work with the original bridging header! + # "point", "x = 3", "y = 4", + "swift struct c member" + ], + ) process.Clear() target.Clear() lldb.SBDebugger.MemoryPressureDetected() diff --git a/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py b/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py index e66892b7ee87a..933d18dd02eeb 100644 --- a/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py +++ b/lldb/test/API/macosx/builtin-debugtrap/TestBuiltinDebugTrap.py @@ -28,7 +28,7 @@ def test(self): if self.TraceOn(): self.runCmd("f") self.runCmd("bt") - self.runCmd("ta v global") + self.runCmd("tar v global") self.assertEqual( process.GetSelectedThread().GetStopReason(), lldb.eStopReasonException @@ -46,7 +46,7 @@ def test(self): if self.TraceOn(): self.runCmd("f") self.runCmd("bt") - self.runCmd("ta v global") + self.runCmd("tar v global") self.assertEqual( process.GetSelectedThread().GetStopReason(), lldb.eStopReasonException @@ -61,7 +61,7 @@ def test(self): if self.TraceOn(): self.runCmd("f") self.runCmd("bt") - self.runCmd("ta v global") + self.runCmd("tar v global") self.assertEqual( process.GetSelectedThread().GetStopReason(), lldb.eStopReasonException