[lldb] Restructure test folders to match LLDB command hierarchy

Summary:
As discussed on lldb-dev, this patch moves some LLDB tests into a hierarchy that more closely
resembles the commands we use in the LLDB interpreter. This patch should only move tests
that use the command interpreter and shouldn't touch any tests that primarily test the SB API.

Reviewers: #lldb, jfb, JDevlieghere

Reviewed By: #lldb, JDevlieghere

Subscribers: dexonsmith, arphaman, JDevlieghere, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D67033

llvm-svn: 370605

584 files changed, 0 insertions, 4865 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/Makefile b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py
index 11c3bc86a6e..11c3bc86a6e 100644
--- a/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/TestAddDsymCommand.py
diff --git a/lldb/packages/Python/lldbsuite/test/warnings/uuid/main.cpp.template b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/main.cpp.template
index d486b3dd8b9..d486b3dd8b9 100644
--- a/lldb/packages/Python/lldbsuite/test/warnings/uuid/main.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/commands/add-dsym/uuid/main.cpp.template
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py b/lldb/packages/Python/lldbsuite/test/commands/apropos/basic/TestApropos.py
index c4337c7301f..c4337c7301f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/basic/TestApropos.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/Makefile b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
index 1e146d9f62e..1e146d9f62e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/TestAproposWithProcess.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/TestAproposWithProcess.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/main.cpp
index d18c86512bf..d18c86512bf 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/apropos/with-process/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile
index a6376f9b165..a6376f9b165 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py
index b75a6db6e80..b75a6db6e80 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommand.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommandsFromPython.py
index 962728a324e..962728a324e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestBreakpointCommandsFromPython.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestRegexpBreakCommand.py
index 8774d3763a6..8774d3763a6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/TestRegexpBreakCommand.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/a.c
index 870e4a6ab16..870e4a6ab16 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/a.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/b.c
index 02b78e7bd85..02b78e7bd85 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/b.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/bktptcmd.py
index ac0f753ccd8..ac0f753ccd8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/bktptcmd.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/main.c
index 8bebb9455a6..8bebb9455a6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/side_effect.py b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/side_effect.py
index ef4ab2b159c..ef4ab2b159c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/side_effect.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/breakpoint/basic/side_effect.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/history/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/history/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py b/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py
index 2763ab50c88..2763ab50c88 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/history/TestCommandHistory.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
index 37c56f6d216..37c56f6d216 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/TestNestedAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/TestNestedAlias.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/main.cpp
index 4df7eed40a5..4df7eed40a5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/nested_alias/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/script/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_history/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/char/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/char/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py
index 6531cd67279..6531cd67279 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/TestCommandScript.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/bug11569.py
index 3c124de79bf..3c124de79bf 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/bug11569.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/decorated.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/decorated.py
index f9707a5706a..f9707a5706a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/decorated.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/decorated.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile
index 9374aef487f..9374aef487f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py
index bbeee1a5e32..bbeee1a5e32 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/TestImport.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/bar.py
index 444e00976ad..444e00976ad 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/bar.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/barutil.py
index 70ecea30057..70ecea30057 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/bar/barutil.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/dummymodule.py
index 668a5b90ea4..668a5b90ea4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/dummymodule.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/bar/foobar.py
index 6ef71064c9a..6ef71064c9a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/bar/foobar.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo.py
index 1ccc3892939..1ccc3892939 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo2.py
index 71657c299c2..71657c299c2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/foo/foo2.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/main.c b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/main.c
index dffc8c77b04..dffc8c77b04 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/Makefile b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile
index 7913aaa4b74..7913aaa4b74 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py
index fdcf8764e67..fdcf8764e67 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/TestRdar12586188.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail12586188.py
index ea385e03e04..ea385e03e04 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail12586188.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail212586188.py
index 8dbc0e67ba1..8dbc0e67ba1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/rdar-12586188/fail212586188.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitA.py
index 9694b084295..9694b084295 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitA.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitB.py
index 94a333bc696..94a333bc696 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/TPunitB.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/__init__.py
index 24cdea60f2c..24cdea60f2c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/import/thepackage/__init__.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/command/script/main.cpp
index a0e9efd6ee0..a0e9efd6ee0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/mysto.py
index 04eceb7eb93..04eceb7eb93 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/mysto.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/py_import b/lldb/packages/Python/lldbsuite/test/commands/command/script/py_import
index 6c1f7b8185f..6c1f7b8185f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/py_import
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/py_import
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py b/lldb/packages/Python/lldbsuite/test/commands/command/script/welcome.py
index 0539d7c1721..0539d7c1721 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script/welcome.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
index e454365edeb..e454365edeb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/TestCommandScriptAlias.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/TestCommandScriptAlias.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/tcsacmd.py
index 8d3248c2723..8d3248c2723 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/tcsacmd.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/script_alias/tcsacmd.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/.categories b/lldb/packages/Python/lldbsuite/test/commands/command/source/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script_alias/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.lldb b/lldb/packages/Python/lldbsuite/test/commands/command/source/.lldb
index ecbdcff4462..ecbdcff4462 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.lldb
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/.lldb
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py b/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py
index a30f0d497be..a30f0d497be 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/TestCommandSource.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/commands.txt b/lldb/packages/Python/lldbsuite/test/commands/command/source/commands.txt
index 8e4de66d469..8e4de66d469 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/commands.txt
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/commands.txt
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/my.py b/lldb/packages/Python/lldbsuite/test/commands/command/source/my.py
index bd97fda3cbb..bd97fda3cbb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/my.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/command/source/my.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py
index 1ad8e23ac9b..1ad8e23ac9b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestDisassembleBreakpoint.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestFrameDisassemble.py b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py
index 912b37d6d3e..912b37d6d3e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestFrameDisassemble.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/TestFrameDisassemble.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/main.cpp
index 93d4b1cbd39..93d4b1cbd39 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/disassemble/basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/.categories b/lldb/packages/Python/lldbsuite/test/commands/expression/.categories
index 897e40a99dd..897e40a99dd 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/TestCallUserAnonTypedef.py b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
index 1108b121532..1108b121532 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/TestCallUserAnonTypedef.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/TestCallUserAnonTypedef.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/main.cpp
index 5b170c5f943..5b170c5f943 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/anonymous-struct/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/anonymous-struct/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/TestArgumentPassingRestrictions.py b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
index 858f2785be8..858f2785be8 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/TestArgumentPassingRestrictions.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/TestArgumentPassingRestrictions.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/main.cpp
index 4b3b6950455..4b3b6950455 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/argument_passing_restrictions/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/argument_passing_restrictions/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/calculator_mode/TestCalculatorMode.py b/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
index 46ea111bf03..46ea111bf03 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/calculator_mode/TestCalculatorMode.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/calculator_mode/TestCalculatorMode.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
index 9d4f3b7f141..9d4f3b7f141 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallBuiltinFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py
index 87787f3479a..87787f3479a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallBuiltinFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallBuiltinFunction.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py
index 8f2ea371f2b..8f2ea371f2b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStdStringFunction.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py
index d832983bdb6..d832983bdb6 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallStopAndContinue.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py
index 0eb7086b616..0eb7086b616 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/TestCallUserDefinedFunction.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/main.cpp
index cc5f52dbf56..cc5f52dbf56 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-function/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile
index 9d4f3b7f141..9d4f3b7f141 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/TestCallOverriddenMethod.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/TestCallOverriddenMethod.py
index 1e61aa9f46e..1e61aa9f46e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/TestCallOverriddenMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/TestCallOverriddenMethod.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/main.cpp
index 54ae705d297..54ae705d297 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-overridden-method/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-overridden-method/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
index 1c93ae1de43..1c93ae1de43 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py
index 1182b156e80..1182b156e80 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/TestCallThatRestarts.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/lotta-signals.c b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/lotta-signals.c
index f5c15b41e2d..f5c15b41e2d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/lotta-signals.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-restarts/lotta-signals.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
index ac07b31c48c..ac07b31c48c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py
index c6b90ba5ba0..c6b90ba5ba0 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/TestCallThatThrows.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/call-throws.m b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/call-throws.m
index a184718be7d..a184718be7d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/call-throws.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/call-throws/call-throws.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
index b8eaf51d3e2..b8eaf51d3e2 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/TestCastIntToAnonymousEnum.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/main.cpp
index 7ae4c1735db..7ae4c1735db 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/cast_int_to_anonymous_enum/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/cast_int_to_anonymous_enum/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py b/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py
index a9679b7dd36..a9679b7dd36 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/TestExprsChar.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/char/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/char/main.cpp
index c8b0beb1b35..c8b0beb1b35 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/char/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/char/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
index d1974d05a24..d1974d05a24 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/TestClassTemplateSpecializationParametersHandling.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/main.cpp
index bc831604aed..bc831604aed 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/class_template_specialization_empty_pack/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/class_template_specialization_empty_pack/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile
index 82355a233cf..82355a233cf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
index 68bd864c008..68bd864c008 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/TestCompletionCrashIncompleteRecord.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/main.cpp
index f7ca83c6540..f7ca83c6540 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-incomplete-record/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-incomplete-record/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-lambda/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile
index 82355a233cf..82355a233cf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash-lambda/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash-lambda/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile
index 82355a233cf..82355a233cf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/TestCompletionCrash1.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/TestCompletionCrash1.py
index 3f2a6100607..3f2a6100607 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/TestCompletionCrash1.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/TestCompletionCrash1.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/main.cpp
index 7b123c0662d..7b123c0662d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash1/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash1/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile
index 82355a233cf..82355a233cf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/TestCompletionCrash2.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/TestCompletionCrash2.py
index 922347aa781..922347aa781 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/TestCompletionCrash2.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/TestCompletionCrash2.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/main.cpp
index 02f15c295c2..02f15c295c2 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-crash2/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-crash2/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-in-lambda-and-unnnamed-class/TestCompletionInLambdaAndUnnamedClass.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnnamed-class/TestCompletionInLambdaAndUnnamedClass.py
index 57fb94b6d66..57fb94b6d66 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-in-lambda-and-unnnamed-class/TestCompletionInLambdaAndUnnamedClass.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnnamed-class/TestCompletionInLambdaAndUnnamedClass.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion-in-lambda-and-unnnamed-class/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnnamed-class/main.cpp
index a3d8ab6532e..a3d8ab6532e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion-in-lambda-and-unnnamed-class/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion-in-lambda-and-unnnamed-class/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.categories b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
index 6fc26a9193f..6fc26a9193f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion/TestExprCompletion.py b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py
index 33a423c806b..33a423c806b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion/TestExprCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/TestExprCompletion.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/main.cpp
index 908bebbebff..908bebbebff 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/completion/other.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/other.cpp
index 1f8a488639b..1f8a488639b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/completion/other.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/completion/other.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
index b6592745356..b6592745356 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/TestContextObjectObjc.py b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/TestContextObjectObjc.py
index 4ae4fd8680d..4ae4fd8680d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/TestContextObjectObjc.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/TestContextObjectObjc.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/main.m b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/main.m
index 5c495b24894..5c495b24894 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object-objc/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object-objc/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/TestContextObject.py b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/TestContextObject.py
index 02b8162aad6..02b8162aad6 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/TestContextObject.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/TestContextObject.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/main.cpp
index 098b6089fce..098b6089fce 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/context-object/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/context-object/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/TestDollarInVariable.py b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/TestDollarInVariable.py
index 7458867527d..7458867527d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/TestDollarInVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/TestDollarInVariable.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/main.c
index e5fec25b35b..e5fec25b35b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dollar-in-variable/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dollar-in-variable/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
index 50d4ab65a6e..50d4ab65a6e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/TestAllowJIT.py b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py
index 19d9fa7e425..19d9fa7e425 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/TestAllowJIT.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/TestAllowJIT.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/main.c
index ebd8ae11a73..ebd8ae11a73 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/dont_allow_jit/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/dont_allow_jit/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/TestExprEntryBP.py b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/TestExprEntryBP.py
index 56abc19f4f3..56abc19f4f3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/TestExprEntryBP.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/TestExprEntryBP.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/main.c
index 168fc9c8ccb..168fc9c8ccb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/entry-bp/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
index 6a7e6075253..6a7e6075253 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/TestExpressionInSyscall.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/main.cpp
index 743b69434d5..743b69434d5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/expr-in-syscall/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/TestFixIts.py b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py
index 9aa28f77a3f..9aa28f77a3f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/TestFixIts.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/TestFixIts.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/main.cpp
index 371d8333763..371d8333763 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/fixits/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/fixits/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
index b13d6555f33..b13d6555f33 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/TestFormatters.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/foosynth.py b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/foosynth.py
index 7b1284d2a76..7b1284d2a76 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/foosynth.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/foosynth.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/formatters.py b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/formatters.py
index dae84988af9..dae84988af9 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/formatters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/formatters.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp
index 1b8ce48041f..1b8ce48041f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/formatters/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/formatters/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
index bd5bc0ec72a..bd5bc0ec72a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/TestFunctionTemplateSpecializationTempArgs.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/main.cpp
index 6d01288259a..6d01288259a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/function_template_specialization_temp_args/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/function_template_specialization_temp_args/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/TestImportStdModule.py
index 19e02ca84c9..19e02ca84c9 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/TestImportStdModule.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/TestImportStdModule.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/main.cpp
index 2f6d078daa3..2f6d078daa3 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/basic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
index 2abaece27fe..2abaece27fe 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/TestStdModuleWithConflicts.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/TestStdModuleWithConflicts.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/main.cpp
index e49b862a36c..e49b862a36c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/conflicts/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/conflicts/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/TestBasicDeque.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/TestBasicDeque.py
index 0ede19e8350..0ede19e8350 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/TestBasicDeque.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/TestBasicDeque.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/main.cpp
index 5bed55674bf..5bed55674bf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-basic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/TestDbgInfoContentDeque.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDeque.py
index eeea34819dd..eeea34819dd 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/TestDbgInfoContentDeque.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/TestDbgInfoContentDeque.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/main.cpp
index f8fd1fb2dd9..f8fd1fb2dd9 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/deque-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/deque-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/TestBasicForwardList.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/TestBasicForwardList.py
index 528d555e0af..528d555e0af 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/TestBasicForwardList.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/TestBasicForwardList.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/main.cpp
index 4f5e30f0629..4f5e30f0629 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-basic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardList.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardList.py
index a2fc5598930..a2fc5598930 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardList.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/TestDbgInfoContentForwardList.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp
index b1ffc4b24cd..b1ffc4b24cd 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/forward_list-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/forward_list-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/TestBasicList.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/TestBasicList.py
index 154c8ed7bd0..154c8ed7bd0 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/TestBasicList.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/TestBasicList.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/main.cpp
index e54719a02fb..e54719a02fb 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-basic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/TestDbgInfoContentList.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentList.py
index 713ec1abb85..713ec1abb85 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/TestDbgInfoContentList.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/TestDbgInfoContentList.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/main.cpp
index 3cfb35f8c6b..3cfb35f8c6b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/list-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/list-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/TestMissingStdModule.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
index f4d3d1fd492..f4d3d1fd492 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/TestMissingStdModule.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/TestMissingStdModule.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/main.cpp
index c93e9d0ec8a..c93e9d0ec8a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/no-std-module/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/no-std-module/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/TestQueue.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/TestQueue.py
index aad1b11719b..aad1b11719b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/TestQueue.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/TestQueue.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/main.cpp
index 66e8f02c273..66e8f02c273 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/queue/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/queue/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContent.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContent.py
index 028798f72f3..028798f72f3 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContent.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/TestSharedPtrDbgInfoContent.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp
index 73664f1c83a..73664f1c83a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/TestSharedPtr.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/TestSharedPtr.py
index 6f1e7b12d1f..6f1e7b12d1f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/TestSharedPtr.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/TestSharedPtr.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/main.cpp
index cb81754087f..cb81754087f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/shared_ptr/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/shared_ptr/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/TestStack.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/TestStack.py
index 1c2e5da54ed..1c2e5da54ed 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/TestStack.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/TestStack.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/main.cpp
index 0ce94990733..0ce94990733 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/stack/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/stack/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
index e04d73ea487..e04d73ea487 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/TestStdModuleSysroot.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
index dfd90e80e45..dfd90e80e45 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/TestStdModuleSysroot.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/TestStdModuleSysroot.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/main.cpp
index 2fbc76b9a76..2fbc76b9a76 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/c++/include/algorithm b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/include/algorithm
index e8cbcca8e84..e8cbcca8e84 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/c++/include/algorithm
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/include/algorithm
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/c++/include/module.modulemap b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/include/module.modulemap
index 0eb48492a65..0eb48492a65 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/c++/include/module.modulemap
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/c++/include/module.modulemap
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/libc_header.h b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h
index 47525c9db34..47525c9db34 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/sysroot/root/usr/include/libc_header.h
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/sysroot/root/usr/include/libc_header.h
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
index c321d8022e1..c321d8022e1 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/TestUniquePtrDbgInfoContent.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp
index 73664f1c83a..73664f1c83a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/TestUniquePtr.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/TestUniquePtr.py
index 295ec512327..295ec512327 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/TestUniquePtr.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/TestUniquePtr.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/main.cpp
index cb81754087f..cb81754087f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/unique_ptr/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/unique_ptr/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/TestBasicVector.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/TestBasicVector.py
index deaf8f0cb75..deaf8f0cb75 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/TestBasicVector.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/TestBasicVector.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/main.cpp
index edf130d4748..edf130d4748 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-basic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/TestBoolVector.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/TestBoolVector.py
index 0ab52695faf..0ab52695faf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/TestBoolVector.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/TestBoolVector.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/main.cpp
index 9554401cf50..9554401cf50 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-bool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-bool/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/TestDbgInfoContentVector.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVector.py
index c89265f2cd3..c89265f2cd3 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/TestDbgInfoContentVector.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/TestDbgInfoContentVector.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/main.cpp
index 24c3fec75d2..24c3fec75d2 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/TestVectorOfVectors.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectors.py
index 2b82e1a039a..2b82e1a039a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/TestVectorOfVectors.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/TestVectorOfVectors.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/main.cpp
index b5ada909e43..b5ada909e43 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/vector-of-vectors/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/vector-of-vectors/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtr.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtr.py
index 0acd54e803c..0acd54e803c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtr.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/TestDbgInfoContentWeakPtr.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp
index d2c5a6258a5..d2c5a6258a5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr-dbg-info-content/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr-dbg-info-content/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile
index 01718d86aa7..01718d86aa7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/TestWeakPtr.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/TestWeakPtr.py
index 6b8b9ceb7aa..6b8b9ceb7aa 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/TestWeakPtr.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/TestWeakPtr.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/main.cpp
index 13479eb9496..13479eb9496 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import-std-module/weak_ptr/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import-std-module/weak_ptr/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
index 4464e2ee9f5..4464e2ee9f5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/TestImportBuiltinFileID.py b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
index 08b6a8c90f5..08b6a8c90f5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/TestImportBuiltinFileID.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/TestImportBuiltinFileID.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/main.m b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/main.m
index ef74940b0ac..ef74940b0ac 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/import_builtin_fileid/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/import_builtin_fileid/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/TestInlineNamespace.py b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/TestInlineNamespace.py
index b17115be292..b17115be292 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/TestInlineNamespace.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/TestInlineNamespace.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/main.cpp
index c10b361a0cd..c10b361a0cd 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/inline-namespace/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/inline-namespace/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile
index bf2c0b2c108..bf2c0b2c108 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
index 20a9477b1f7..20a9477b1f7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/TestIRInterpreterPHINodes.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/main.cpp
index 8e181aeba3b..8e181aeba3b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter-phi-nodes/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter-phi-nodes/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
index c4169a9b101..c4169a9b101 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/TestIRInterpreter.py b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py
index 509e3fbd6d0..509e3fbd6d0 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/TestIRInterpreter.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/TestIRInterpreter.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/main.c
index 31204b21d97..31204b21d97 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/ir-interpreter/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/ir-interpreter/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py
index 2c20b63cfd9..2c20b63cfd9 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/Test11588.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/main.cpp
index 4f9ea3abf18..4f9ea3abf18 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/s11588.py
index 51c20423ed3..51c20423ed3 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/issue_11588/s11588.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/macros/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile
index 1ecd744be14..1ecd744be14 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/macros/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/macros/TestMacros.py b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py
index 817f6cb3944..817f6cb3944 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/macros/TestMacros.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/TestMacros.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/macros/macro1.h b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro1.h
index e026bc018ac..e026bc018ac 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/macros/macro1.h
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro1.h
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/macros/macro2.h b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro2.h
index cec6efbba99..cec6efbba99 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/macros/macro2.h
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/macro2.h
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/macros/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/main.cpp
index f2c2c101fa1..f2c2c101fa1 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/macros/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/macros/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/TestMultilineCompletion.py b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/TestMultilineCompletion.py
index 7447e158641..7447e158641 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/TestMultilineCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/TestMultilineCompletion.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/main.c
index 03350dd8299..03350dd8299 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/multiline-completion/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/multiline-completion/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
index ab2ddd07480..ab2ddd07480 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/TestNamespaceLocalVarSameNameCppAndC.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp
index 5e8237ed190..5e8237ed190 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_cpp_and_c/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_cpp_and_c/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
index 67553218d80..67553218d80 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
index eb894cc37e4..eb894cc37e4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/TestNamespaceLocalVarSameNameObjC.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/main.mm b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/main.mm
index 70e9598eefb..70e9598eefb 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/main.mm
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/util.mm b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/util.mm
index 11c9c141df0..11c9c141df0 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/namespace_local_var_same_name_obj_c/util.mm
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/namespace_local_var_same_name_obj_c/util.mm
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/.categories b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/.categories
index 897e40a99dd..897e40a99dd 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
index a10791d5890..a10791d5890 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/TestExprDoesntBlock.py
index 5b5042b63e4..5b5042b63e4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/TestExprDoesntBlock.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/locking.c b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/locking.c
index fae9979611d..fae9979611d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/locking.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/no-deadlock/locking.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
index 81ae6f6f16e..81ae6f6f16e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py b/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py
index 8af0ea1ba0c..8af0ea1ba0c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/TestExprOptions.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/options/foo.cpp
index 8a5a6a2b541..8a5a6a2b541 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/foo.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/options/main.cpp
index 0d30c79bd22..0d30c79bd22 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/options/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
index 8066198300f..8066198300f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index b6471d0f897..b6471d0f897 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/TestPersistObjCPointeeType.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/main.m b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/main.m
index a2b6b703d6c..a2b6b703d6c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persist_objc_pointeetype/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile
index db5f575866d..db5f575866d 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
index 7b963b5bfcd..7b963b5bfcd 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/TestPersistentPtrUpdate.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/main.c
index 73346969ecc..73346969ecc 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_ptr_update/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py
index bde649b0e07..bde649b0e07 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestNestedPersistentTypes.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py
index 91681b480eb..91681b480eb 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/TestPersistentTypes.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/main.c
index 9425c8b1cec..9425c8b1cec 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_types/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
index 57370f121b4..57370f121b4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/TestPersistentVariables.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c
index 771bf4ad342..771bf4ad342 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/persistent_variables/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
index b6592745356..b6592745356 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py
index 4530342ea52..4530342ea52 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/TestPoVerbosity.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/main.m
index 9c79f850bf2..9c79f850bf2 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/po_verbosity/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos_with_process/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py
index 6d019c7415f..6d019c7415f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/TestExprsBug35310.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/TestExprsBug35310.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/main.cpp
index a8e8a5c737a..a8e8a5c737a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/pr35310/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/pr35310/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py
index e7a5f597b70..e7a5f597b70 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/Test8638051.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/main.c
index dc528a458b3..dc528a458b3 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_8638051/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py
index 4ff28bdfe86..4ff28bdfe86 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/TestPrintfAfterUp.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/main.c
index 43200d31745..43200d31745 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9531204/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py
index 5406fb0e987..5406fb0e987 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/TestExprHelpExamples.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/main.c
index c765cf2a83a..c765cf2a83a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/radar_9673664/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/TestScalarURem.py
index 03424658f3e..03424658f3e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/TestScalarURem.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/TestScalarURem.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/main.c
index 98a957faf8b..98a957faf8b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar42038760/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar42038760/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/Test128BitsInteger.py b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Test128BitsInteger.py
index 433c275fb58..433c275fb58 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/Test128BitsInteger.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/Test128BitsInteger.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/main.c
index 156dbf04a1b..156dbf04a1b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/rdar44436068/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/rdar44436068/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/expr-entry-bp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/TestSaveJITObjects.py b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py
index 896e599f59c..896e599f59c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/TestSaveJITObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/TestSaveJITObjects.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/main.c
index c9775b6e989..c9775b6e989 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/save_jit_objects/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/save_jit_objects/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
index 83b24da17b4..83b24da17b4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py
index e7bc79d8e7c..e7bc79d8e7c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/TestScopedEnumType.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/TestScopedEnumType.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/main.cpp
index b0d67d23dc5..b0d67d23dc5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/scoped_enums/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/scoped_enums/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/command_script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py
index 4fe228d40d4..4fe228d40d4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py
index 1a733bebffe..1a733bebffe 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/TestExprs2.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/test/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/test/main.cpp
index 22208a87cb4..22208a87cb4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/test/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/test/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
index c9cff412c1b..c9cff412c1b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py
index 7862477001e..7862477001e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/TestCallWithTimeout.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/wait-a-while.cpp
index ac37c5d243b..ac37c5d243b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/timeout/wait-a-while.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
index 9e35242c72f..9e35242c72f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py
index e6a632b7f23..e6a632b7f23 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/TestTopLevelExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/TestTopLevelExprs.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/dummy.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.cpp
index fa49bd4bda7..fa49bd4bda7 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/dummy.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/dummy.mk b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk
index af97678b2cf..af97678b2cf 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/dummy.mk
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/dummy.mk
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/main.cpp
index f9b2dd4c6d9..f9b2dd4c6d9 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/test.cpp
index 5a978743596..5a978743596 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/top-level/test.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/top-level/test.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
index 5974461e256..5974461e256 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index bac8e5453e4..bac8e5453e4 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/foo.m b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/foo.m
index 1609ebd838f..1609ebd838f 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/foo.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/foo.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/main.m b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/main.m
index 3f5738314e6..3f5738314e6 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/two-files/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/two-files/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile
index 3759b5f9255..3759b5f9255 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/TestUnicodeInVariable.py b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
index 03424658f3e..03424658f3e 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/TestUnicodeInVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/TestUnicodeInVariable.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/main.cpp
index 82e38b1ef4c..82e38b1ef4c 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unicode-in-variable/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unicode-in-variable/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py
index d42ee3de404..d42ee3de404 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/TestUnwindExpression.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/TestUnwindExpression.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/main.cpp
index 56b06f31ecc..56b06f31ecc 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/unwind_expression/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/unwind_expression/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/TestVectorOfEnums.py b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/TestVectorOfEnums.py
index 2da95460e24..2da95460e24 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/TestVectorOfEnums.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/TestVectorOfEnums.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/main.cpp
index 10d3ae569a5..10d3ae569a5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/vector_of_enums/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/vector_of_enums/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
index ea434d42714..ea434d42714 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/TestWeakSymbols.py b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py
index 2999cba7d99..2999cba7d99 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/TestWeakSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/TestWeakSymbols.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/dylib.c b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.c
index dc513e5c5fb..dc513e5c5fb 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/dylib.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/dylib.h b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.h
index f668ec0a784..f668ec0a784 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/dylib.h
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/dylib.h
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/main.c b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/main.c
index 5ea257bae5b..5ea257bae5b 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/module.modulemap b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/module.modulemap
index 6f7671400bc..6f7671400bc 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/weak_symbols/module.modulemap
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/weak_symbols/module.modulemap
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/Makefile b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nested_alias/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/TestXValuePrinting.py b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py
index 3aac6488660..3aac6488660 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/TestXValuePrinting.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/TestXValuePrinting.py
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/main.cpp
index 556c63f2b44..556c63f2b44 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/xvalue/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/expression/xvalue/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py
index 741fb7bbaa0..741fb7bbaa0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/TestArray.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/TestArray.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/main.c
index 95c6515e5f5..95c6515e5f5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/array/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py
index 3ba0f7a6c42..3ba0f7a6c42 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/TestBadReference.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/TestBadReference.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/main.cpp
index 2f61152e398..2f61152e398 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/bad-reference/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
index 52691d9f471..52691d9f471 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/TestComplicatedExpression.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/TestComplicatedExpression.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/main.c
index 147aae94614..147aae94614 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/complicated-expression/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
index c0dac49586f..c0dac49586f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/TestDiagnoseDereferenceArgument.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/main.c
index 0ec23b13be1..0ec23b13be1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-argument/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
index ebce5ae54c2..ebce5ae54c2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/TestDiagnoseDereferenceFunctionReturn.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/main.c
index 420e6f21de6..420e6f21de6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-function-return/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
index 1251ad551ac..1251ad551ac 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/TestDiagnoseDereferenceThis.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/TestDiagnoseDereferenceThis.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp
index 1f177230ed9..1f177230ed9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/dereference-this/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/bad-reference/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
index 18fb263b47b..18fb263b47b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/TestDiagnoseInheritance.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/TestDiagnoseInheritance.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/main.cpp
index 78cac2c8965..78cac2c8965 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/inheritance/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py
index e4fd86e0db4..e4fd86e0db4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/TestLocalVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/TestLocalVariable.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/main.c
index 33307beb070..33307beb070 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/local-variable/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-function-return/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
index ed91b487c95..ed91b487c95 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/TestDiagnoseDereferenceVirtualMethodCall.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/main.cpp
index 2a03dc11bf2..2a03dc11bf2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/diagnose/virtual-method-call/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile
index cb1af719ac3..cb1af719ac3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
index 19fa3e9f0d8..19fa3e9f0d8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/TestGuessLanguage.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/TestGuessLanguage.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/language/main.cpp
index f5449f21790..f5449f21790 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other-2.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other-2.cpp
index 77632de3ceb..77632de3ceb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other-2.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other-2.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other.cpp b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.cpp
index 41f4f26079a..41f4f26079a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other.h b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.h
index 0a2c125e6b4..0a2c125e6b4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/other.h
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/other.h
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/somefunc.c b/lldb/packages/Python/lldbsuite/test/commands/frame/language/somefunc.c
index a4b4f47f32e..a4b4f47f32e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-language/somefunc.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/language/somefunc.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile
index 45f00b3e986..45f00b3e986 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/TestFrameRecognizer.py b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/TestFrameRecognizer.py
index 2ecbe1e4c15..2ecbe1e4c15 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/TestFrameRecognizer.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/TestFrameRecognizer.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/main.m b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/main.m
index 9c6ce9d2102..9c6ce9d2102 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/main.m
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/main.m
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/recognizer.py b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/recognizer.py
index a8a50674511..a8a50674511 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-recognizer/recognizer.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/recognizer.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/TestFrameVariableScope.py b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/TestFrameVariableScope.py
index 48e49ed009b..48e49ed009b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/TestFrameVariableScope.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/TestFrameVariableScope.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/main.c
index 71f4cb234e3..71f4cb234e3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var_scope/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var-scope/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
index 50d4ab65a6e..50d4ab65a6e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py b/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py
index 8b294a71c18..8b294a71c18 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/TestFrameVar.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/TestFrameVar.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/main.c b/lldb/packages/Python/lldbsuite/test/commands/frame/var/main.c
index da23af2ac55..da23af2ac55 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame_var/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/frame/var/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py
index 55bcbd02be7..55bcbd02be7 100644
--- a/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/help/TestHelp.py
diff --git a/lldb/packages/Python/lldbsuite/test/logging/Makefile b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile
index d4bc9c68904..d4bc9c68904 100644
--- a/lldb/packages/Python/lldbsuite/test/logging/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py b/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py
index 526288f3deb..526288f3deb 100644
--- a/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/TestLogging.py
diff --git a/lldb/packages/Python/lldbsuite/test/logging/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/log/basic/main.cpp
index f5f1687695b..f5f1687695b 100644
--- a/lldb/packages/Python/lldbsuite/test/logging/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/log/basic/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py
index 2e1deefe90e..2e1deefe90e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformCommand.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformPython.py b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py
index f105847d0bb..f105847d0bb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/platform/basic/TestPlatformPython.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile
index 13d40a13b3e..13d40a13b3e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
index 2c402e6a31a..2c402e6a31a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/TestAttachResume.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/main.cpp
index 82aad70eed5..82aad70eed5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach-resume/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile
index a964853f534..a964853f534 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py
index 6210ba0eefc..6210ba0eefc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/TestProcessAttach.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile
index 3c1f73515eb..3c1f73515eb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py
index 49499554c2e..49499554c2e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/TestAttachDenied.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/entitlements.plist b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/entitlements.plist
index 3d60e8bd0b9..3d60e8bd0b9 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/entitlements.plist
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/entitlements.plist
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/main.cpp
index ff1fccae4b1..ff1fccae4b1 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/attach_denied/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/attach/main.cpp
index 46ffacc0a84..46ffacc0a84 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/attach/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
index 1ba812159fb..1ba812159fb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/TestLaunchWithShellExpand.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file1.txt b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file1.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file1.txt
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file1.txt
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file2.txt b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file2.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file2.txt
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file2.txt
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file3.txt b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file3.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file3.txt
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file3.txt
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file4.txy b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file4.txy
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file4.txy
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file4.txy
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file5.tyx b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file5.tyx
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file5.tyx
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/file5.tyx
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/foo bar b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/foo bar
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/foo bar
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/foo bar
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/main.cpp
index cbef8d1e6da..cbef8d1e6da 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch-with-shellexpand/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/Makefile b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile
index 313da706b4a..313da706b4a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/packages/Python/lldbsuite/test/commands/process/launch/TestProcessLaunch.py
index a2b27c2e590..a2b27c2e590 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/TestProcessLaunch.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/input-file.txt b/lldb/packages/Python/lldbsuite/test/commands/process/launch/input-file.txt
index cc269ba0ff8..cc269ba0ff8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/input-file.txt
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/input-file.txt
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/launch/main.cpp
index f2035d55167..f2035d55167 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_cwd.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_cwd.cpp
index b4b073fbcb8..b4b073fbcb8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_cwd.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_cwd.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_env.cpp b/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_env.cpp
index 8c6df8ea01a..8c6df8ea01a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_env.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/process/launch/print_env.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/quit/TestQuit.py b/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py
index 28c05b833d6..28c05b833d6 100644
--- a/lldb/packages/Python/lldbsuite/test/quit/TestQuit.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/quit/TestQuit.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile
index 1c1be94b3d0..1c1be94b3d0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/TestMPXRegisters.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py
index f61ba59a5fe..f61ba59a5fe 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/TestMPXRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/TestMPXRegisters.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/main.cpp
index 97b50585a52..97b50585a52 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile
index aa88c47ff3f..aa88c47ff3f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
index 5b5f6aa19cb..5b5f6aa19cb 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/TestBoundViolation.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
index 3c5ef07e4b6..3c5ef07e4b6 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/intel_xtended_registers/mpx_bound_violation/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/intel_xtended_registers/mpx_bound_violation/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile
index 3c6deff2d97..3c6deff2d97 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/TestRegisters.py
index 2c0425c4225..2c0425c4225 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/TestRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/TestRegisters.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/a.cpp b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/a.cpp
index 79f111aa247..79f111aa247 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/a.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/main.cpp
index 493a09e034d..493a09e034d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/register/register_command/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/register/register/register_command/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/reproducer/TestReproducer.py b/lldb/packages/Python/lldbsuite/test/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
index bb013409ace..bb013409ace 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/reproducer/TestReproducer.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/reproducer/invalid-args/TestInvalidArgsReproducer.py
diff --git a/lldb/packages/Python/lldbsuite/test/settings/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile
index d4bc9c68904..d4bc9c68904 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py
index de56195ab2f..de56195ab2f 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/TestSettings.py
diff --git a/lldb/packages/Python/lldbsuite/test/settings/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/settings/main.cpp
index 5159eaa65b5..5159eaa65b5 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/Makefile b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
index 441b1cc3c87..441b1cc3c87 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/TestQuoting.py
diff --git a/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/main.c
index 2ebaa142bc5..2ebaa142bc5 100644
--- a/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/settings/quoting/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats/Makefile b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile
index f5a47fcc46c..f5a47fcc46c 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stats/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats/TestStats.py b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
index 48e49ed009b..48e49ed009b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stats/TestStats.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/TestStats.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stats/main.c b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/main.c
index 9adb3a09a08..9adb3a09a08 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stats/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/statistics/basic/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile
index 9117ab9388b..9117ab9388b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py b/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py
index c16c6b46dc8..c16c6b46dc8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/TestTargetCommand.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/a.c b/lldb/packages/Python/lldbsuite/test/commands/target/basic/a.c
index ec4824ad4ad..ec4824ad4ad 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/a.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/a.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/b.c b/lldb/packages/Python/lldbsuite/test/commands/target/basic/b.c
index bcc466c8f96..bcc466c8f96 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/b.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/b.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/c.c b/lldb/packages/Python/lldbsuite/test/commands/target/basic/c.c
index a2cb5995aa5..a2cb5995aa5 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/c.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/c.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/globals.c b/lldb/packages/Python/lldbsuite/test/commands/target/basic/globals.c
index 421b34c0cbc..421b34c0cbc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/globals.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/globals.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/invalid_core_file b/lldb/packages/Python/lldbsuite/test/commands/target/basic/invalid_core_file
index 39802f64280..39802f64280 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_command/invalid_core_file
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/basic/invalid_core_file
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
index 15cb0b64f21..15cb0b64f21 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py
index 2d96433b7d4..2d96433b7d4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/TestTargetCreateDeps.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/TestTargetCreateDeps.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/a.cpp b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.cpp
index e80612bd5cc..e80612bd5cc 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/a.mk b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk
index f199bfed5b0..f199bfed5b0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/a.mk
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/a.mk
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/main.cpp
index 7ee1981a4c2..7ee1981a4c2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/target_create_deps/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-deps/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/warnings/uuid/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/packages/Python/lldbsuite/test/warnings/uuid/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
index fd9812320f2..fd9812320f2 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/TestNoSuchArch.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/main.cpp
index 4cce7f667ff..4cce7f667ff 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/create-no-such-arch/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/Makefile b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
index 50d4ab65a6e..50d4ab65a6e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/TestStopHooks.py b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py
index b8f04915563..b8f04915563 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/TestStopHooks.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/TestStopHooks.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/main.c b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/main.c
index d08ad14776b..d08ad14776b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/stop-hooks/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/target/stop-hooks/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/version/TestVersion.py b/lldb/packages/Python/lldbsuite/test/commands/version/TestVersion.py
index ec449fd0c39..ec449fd0c39 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/version/TestVersion.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/version/TestVersion.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/.categories b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/.categories
index 50c1613cda7..50c1613cda7 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/.categories
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/.categories
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile
index 8817fff55e8..8817fff55e8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
index da993c049d3..da993c049d3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/TestWatchLocation.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/main.cpp
index ac8cf6be166..ac8cf6be166 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchlocation/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
index 178507dbdf3..178507dbdf3 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/TestMyFirstWatchpoint.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/main.c
index 173162dd353..173162dd353 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/hello_watchpoint/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/complicated-expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
index 589e2a3393b..589e2a3393b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/TestWatchpointMultipleSlots.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/main.c
index 76ad27a4314..76ad27a4314 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multi_watchpoint_slots/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-this/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/TestMultipleHits.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py
index 59f3d9f716f..59f3d9f716f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/TestMultipleHits.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/TestMultipleHits.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/main.cpp
index f99c12597ee..f99c12597ee 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_hits/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile
index 8817fff55e8..8817fff55e8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
index 90a0b207f64..90a0b207f64 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/TestWatchpointMultipleThreads.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/main.cpp
index 1e6266d2877..1e6266d2877 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/multiple_threads/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/dereference-argument/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
index e0c77b4ea6b..e0c77b4ea6b 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/TestStepOverWatchpoint.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/main.c
index 2d87d9a2f73..2d87d9a2f73 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/step_over_watchpoint/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/local-variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 79cb5ae4761..79cb5ae4761 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/main.c
index 1bf7a00ac83..1bf7a00ac83 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/variable_out_of_scope/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
index b17d28082ce..b17d28082ce 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/TestWatchpointCommands.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile
index ee6b9cc62b4..ee6b9cc62b4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index 1919602f0c8..1919602f0c8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandLLDB.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
index e7e17a982de..e7e17a982de 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/TestWatchpointCommandPython.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/main.cpp
index 43e4c1a7a34..43e4c1a7a34 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/watchpoint_command.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py
index ae5913a500e..ae5913a500e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/watchpoint_command.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/command/watchpoint_command.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile
index ee6b9cc62b4..ee6b9cc62b4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index edd1cfba26f..edd1cfba26f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/TestWatchpointConditionCmd.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/main.cpp
index 3f7c5f5be96..3f7c5f5be96 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/condition/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/main.c
index a9d1cf28da0..a9d1cf28da0 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_commands/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multi_watchpoint_slots/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
index 7acf4e3ff65..7acf4e3ff65 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/TestWatchpointDisable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/TestWatchpointDisable.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/main.c
index dcbc766c594..dcbc766c594 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_disable/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
index c14961c8e8f..c14961c8e8f 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/TestWatchpointEvents.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/main.c
index 4b917536a16..4b917536a16 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_events/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
index 4964fbcb217..4964fbcb217 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/TestValueOfVectorVariable.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/main.c
index 04d8a06a354..04d8a06a354 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_on_vectors/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile
index 8817fff55e8..8817fff55e8 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index 7a00244309a..7a00244309a 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/TestWatchLocationWithWatchSet.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/main.cpp b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/main.cpp
index f21d2b33ff4..f21d2b33ff4 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_set_command/main.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/Makefile b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/TestWatchpointSizes.py b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
index bcfc2a45883..bcfc2a45883 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/TestWatchpointSizes.py
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/TestWatchpointSizes.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/main.c b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/main.c
index 4edcf877e74..4edcf877e74 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/main.c
+++ b/lldb/packages/Python/lldbsuite/test/commands/watchpoints/watchpoint_size/main.c
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile
deleted file mode 100644
index 6067ee45e98..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
deleted file mode 100644
index f4d54111fd5..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestAddressBreakpoints.py
+++ /dev/null
@@ -1,96 +0,0 @@
-"""
-Test address breakpoints set with shared library of SBAddress work correctly.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-class AddressBreakpointTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def test_address_breakpoints(self):
-        """Test address breakpoints set with shared library of SBAddress work correctly."""
-        self.build()
-        self.address_breakpoints()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def address_breakpoints(self):
-        """Test address breakpoints set with shared library of SBAddress work correctly."""
-        exe = self.getBuildArtifact("a.out")
-
-        # Create a target by the debugger.
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # Now create a breakpoint on main.c by name 'c'.
-        breakpoint = target.BreakpointCreateBySourceRegex(
-            "Set a breakpoint here", lldb.SBFileSpec("main.c"))
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() >= 1,
-                        VALID_BREAKPOINT)
-
-        # Get the breakpoint location from breakpoint after we verified that,
-        # indeed, it has one location.
-        location = breakpoint.GetLocationAtIndex(0)
-        self.assertTrue(location and
-                        location.IsEnabled(),
-                        VALID_BREAKPOINT_LOCATION)
-
-        # Next get the address from the location, and create an address breakpoint using
-        # that address:
-
-        address = location.GetAddress()
-        target.BreakpointDelete(breakpoint.GetID())
-
-        breakpoint = target.BreakpointCreateBySBAddress(address)
-
-        # Disable ASLR.  This will allow us to actually test (on platforms that support this flag)
-        # that the breakpoint was able to track the module.
-
-        launch_info = lldb.SBLaunchInfo(None)
-        flags = launch_info.GetLaunchFlags()
-        flags &= ~lldb.eLaunchFlagDisableASLR
-        launch_info.SetLaunchFlags(flags)
-
-        error = lldb.SBError()
-
-        process = target.Launch(launch_info, error)
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        # Did we hit our breakpoint?
-        from lldbsuite.test.lldbutil import get_threads_stopped_at_breakpoint
-        threads = get_threads_stopped_at_breakpoint(process, breakpoint)
-        self.assertTrue(
-            len(threads) == 1,
-            "There should be a thread stopped at our breakpoint")
-
-        # The hit count for the breakpoint should be 1.
-        self.assertTrue(breakpoint.GetHitCount() == 1)
-
-        process.Kill()
-
-        # Now re-launch and see that we hit the breakpoint again:
-        launch_info.Clear()
-        launch_info.SetLaunchFlags(flags)
-
-        process = target.Launch(launch_info, error)
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        thread = get_threads_stopped_at_breakpoint(process, breakpoint)
-        self.assertTrue(
-            len(threads) == 1,
-            "There should be a thread stopped at our breakpoint")
-
-        # The hit count for the breakpoint should now be 2.
-        self.assertTrue(breakpoint.GetHitCount() == 2)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
deleted file mode 100644
index 2dcce03a583..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/TestBadAddressBreakpoints.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""
-Test that breakpoints set on a bad address say they are bad.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-class BadAddressBreakpointTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def test_bad_address_breakpoints(self):
-        """Test that breakpoints set on a bad address say they are bad."""
-        self.build()
-        self.address_breakpoints()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def address_breakpoints(self):
-        """Test that breakpoints set on a bad address say they are bad."""
-        target, process, thread, bkpt = \
-            lldbutil.run_to_source_breakpoint(self,
-                                              "Set a breakpoint here",
-                                              lldb.SBFileSpec("main.c"))
-
-        # Now see if we can read from 0.  If I can't do that, I don't
-        # have a good way to know what an illegal address is...
-        error = lldb.SBError()
-
-        ptr = process.ReadPointerFromMemory(0x0, error)
-
-        if not error.Success():
-            bkpt = target.BreakpointCreateByAddress(0x0)
-            for bp_loc in bkpt:
-                self.assertTrue(bp_loc.IsResolved() == False)
-        else:
-            self.fail(
-                "Could not find an illegal address at which to set a bad breakpoint.")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/main.c
deleted file mode 100644
index 6b779296e18..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/address_breakpoints/main.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-
-int
-main()
-{
-    printf ("Set a breakpoint here.\n");
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile
deleted file mode 100644
index 6067ee45e98..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
deleted file mode 100644
index 411e0cfc907..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/TestBreakpointAutoContinue.py
+++ /dev/null
@@ -1,101 +0,0 @@
-"""
-Test that the breakpoint auto-continue flag works correctly.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-
-
-class BreakpointAutoContinue(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def test_breakpoint_auto_continue(self):
-        """Make sure the auto continue continues with no other complications"""
-        self.build()
-        self.simple_auto_continue()
-
-    def test_auto_continue_with_command(self):
-        """Add a command, make sure the command gets run"""
-        self.build()
-        self.auto_continue_with_command()
-
-    def test_auto_continue_on_location(self):
-        """Set auto-continue on a location and make sure only that location continues"""
-        self.build()
-        self.auto_continue_location()
-
-    def make_target_and_bkpt(self, additional_options=None, num_expected_loc=1,
-                             pattern="Set a breakpoint here"):
-        exe = self.getBuildArtifact("a.out")
-        self.target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.target.IsValid(), "Target is not valid")
-
-        extra_options_txt = "--auto-continue 1 "
-        if additional_options:
-            extra_options_txt += additional_options
-        bpno = lldbutil.run_break_set_by_source_regexp(self, pattern,
-                                            extra_options = extra_options_txt,
-                                            num_expected_locations = num_expected_loc)
-        return bpno
-
-    def launch_it (self, expected_state):
-        error = lldb.SBError()
-        launch_info = lldb.SBLaunchInfo(None)
-        launch_info.SetWorkingDirectory(self.get_process_working_directory())
-
-        process = self.target.Launch(launch_info, error)
-        self.assertTrue(error.Success(), "Launch failed.")
-
-        state = process.GetState()
-        self.assertEqual(state, expected_state, "Didn't get expected state")
-
-        return process
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def simple_auto_continue(self):
-        bpno = self.make_target_and_bkpt()
-        process = self.launch_it(lldb.eStateExited)
-
-        bkpt = self.target.FindBreakpointByID(bpno)
-        self.assertEqual(bkpt.GetHitCount(), 2, "Should have run through the breakpoint twice")
-
-    def auto_continue_with_command(self):
-        bpno = self.make_target_and_bkpt("-N BKPT -C 'break modify --auto-continue 0 BKPT'")
-        process = self.launch_it(lldb.eStateStopped)
-        state = process.GetState()
-        self.assertEqual(state, lldb.eStateStopped, "Process should be stopped")
-        bkpt = self.target.FindBreakpointByID(bpno)
-        threads = lldbutil.get_threads_stopped_at_breakpoint(process, bkpt)
-        self.assertEqual(len(threads), 1, "There was a thread stopped at our breakpoint")
-        self.assertEqual(bkpt.GetHitCount(), 2, "Should have hit the breakpoint twice")
-
-    def auto_continue_location(self):
-        bpno = self.make_target_and_bkpt(pattern="Set a[^ ]* breakpoint here", num_expected_loc=2)
-        bkpt = self.target.FindBreakpointByID(bpno)
-        bkpt.SetAutoContinue(False)
-
-        loc = lldb.SBBreakpointLocation()
-        for i in range(0,2):
-            func_name = bkpt.location[i].GetAddress().function.name
-            if func_name == "main":
-                loc = bkpt.location[i]
-
-        self.assertTrue(loc.IsValid(), "Didn't find a location in main")
-        loc.SetAutoContinue(True)
-
-        process = self.launch_it(lldb.eStateStopped)
-
-        threads = lldbutil.get_threads_stopped_at_breakpoint(process, bkpt)
-        self.assertEqual(len(threads), 1, "Didn't get one thread stopped at our breakpoint")
-        func_name = threads[0].frame[0].function.name
-        self.assertEqual(func_name, "call_me")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/main.c
deleted file mode 100644
index a37f05e0290..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/auto_continue/main.c
+++ /dev/null
@@ -1,19 +0,0 @@
-#include <stdio.h>
-
-void
-call_me()
-{
-  printf("Set another breakpoint here.\n");
-}
-
-int
-main()
-{
-  int change_me = 0;
-  for (int i = 0; i < 2; i++)
-  {
-    printf ("Set a breakpoint here: %d with: %d.\n", i, change_me);
-  }
-  call_me();
-  return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile
deleted file mode 100644
index 6c22351dc3b..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99 -gcolumn-info
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
deleted file mode 100644
index 61794697b31..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/TestBreakpointByLineAndColumn.py
+++ /dev/null
@@ -1,45 +0,0 @@
-"""
-Test setting a breakpoint by line and column.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointByLineAndColumnTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    ## Skip gcc version less 7.1 since it doesn't support -gcolumn-info
-    @skipIf(compiler="gcc", compiler_version=['<', '7.1'])
-    def testBreakpointByLineAndColumn(self):
-        self.build()
-        main_c = lldb.SBFileSpec("main.c")
-        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self,
-                                                              main_c, 19, 50)
-        self.expect("fr v did_call", substrs='1')
-        in_then = False
-        for i in range(breakpoint.GetNumLocations()):
-            b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 19)
-            in_then |= b_loc.GetColumn() == 50
-        self.assertTrue(in_then)
-
-    ## Skip gcc version less 7.1 since it doesn't support -gcolumn-info
-    @skipIf(compiler="gcc", compiler_version=['<', '7.1'])
-    def testBreakpointByLine(self):
-        self.build()
-        main_c = lldb.SBFileSpec("main.c")
-        _, _, _, breakpoint = lldbutil.run_to_line_breakpoint(self, main_c, 19)
-        self.expect("fr v did_call", substrs='0')
-        in_condition = False
-        for i in range(breakpoint.GetNumLocations()):
-            b_loc = breakpoint.GetLocationAtIndex(i).GetAddress().GetLineEntry()
-            self.assertEqual(b_loc.GetLine(), 19)
-            in_condition |= b_loc.GetColumn() < 30
-        self.assertTrue(in_condition)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
deleted file mode 100644
index f9adad30575..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_by_line_and_column/main.c
+++ /dev/null
@@ -1,22 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-int square(int x)
-{
-  return x * x;
-}
-
-int main (int argc, char const *argv[])
-{
-  int did_call = 0;
-
-  // Line 20.                                    v Column 50.
-  if(square(argc+1) != 0) { did_call = 1; return square(argc); }
-  //                                             ^
-  return square(0);
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
deleted file mode 100644
index 6067ee45e98..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
deleted file mode 100644
index 96ed32a9efe..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ /dev/null
@@ -1,226 +0,0 @@
-"""
-Test breakpoint conditions with 'breakpoint modify -c <expr> id'.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointConditionsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_breakpoint_condition_and_run_command(self):
-        """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
-        self.build()
-        self.breakpoint_conditions()
-
-    def test_breakpoint_condition_inline_and_run_command(self):
-        """Exercise breakpoint condition inline with 'breakpoint set'."""
-        self.build()
-        self.breakpoint_conditions(inline=True)
-
-    @add_test_categories(['pyapi'])
-    def test_breakpoint_condition_and_python_api(self):
-        """Use Python APIs to set breakpoint conditions."""
-        self.build()
-        self.breakpoint_conditions_python()
-
-    @add_test_categories(['pyapi'])
-    def test_breakpoint_invalid_condition_and_python_api(self):
-        """Use Python APIs to set breakpoint conditions."""
-        self.build()
-        self.breakpoint_invalid_conditions_python()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to of function 'c'.
-        self.line1 = line_number(
-            'main.c', '// Find the line number of function "c" here.')
-        self.line2 = line_number(
-            'main.c', "// Find the line number of c's parent call here.")
-
-    def breakpoint_conditions(self, inline=False):
-        """Exercise breakpoint condition with 'breakpoint modify -c <expr> id'."""
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        if inline:
-            # Create a breakpoint by function name 'c' and set the condition.
-            lldbutil.run_break_set_by_symbol(
-                self,
-                "c",
-                extra_options="-c 'val == 3'",
-                num_expected_locations=1,
-                sym_exact=True)
-        else:
-            # Create a breakpoint by function name 'c'.
-            lldbutil.run_break_set_by_symbol(
-                self, "c", num_expected_locations=1, sym_exact=True)
-
-            # And set a condition on the breakpoint to stop on when 'val == 3'.
-            self.runCmd("breakpoint modify -c 'val == 3' 1")
-
-        # Now run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The process should be stopped at this point.
-        self.expect("process status", PROCESS_STOPPED,
-                    patterns=['Process .* stopped'])
-
-        # 'frame variable --show-types val' should return 3 due to breakpoint condition.
-        self.expect(
-            "frame variable --show-types val",
-            VARIABLES_DISPLAYED_CORRECTLY,
-            startstr='(int) val = 3')
-
-        # Also check the hit count, which should be 3, by design.
-        self.expect("breakpoint list -f", BREAKPOINT_HIT_ONCE,
-                    substrs=["resolved = 1",
-                             "Condition: val == 3",
-                             "hit count = 1"])
-
-        # The frame #0 should correspond to main.c:36, the executable statement
-        # in function name 'c'.  And the parent frame should point to
-        # main.c:24.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_CONDITION,
-                    #substrs = ["stop reason = breakpoint"],
-                    patterns=["frame #0.*main.c:%d" % self.line1,
-                              "frame #1.*main.c:%d" % self.line2])
-
-        # Test that "breakpoint modify -c ''" clears the condition for the last
-        # created breakpoint, so that when the breakpoint hits, val == 1.
-        self.runCmd("process kill")
-        self.runCmd("breakpoint modify -c ''")
-        self.expect(
-            "breakpoint list -f",
-            BREAKPOINT_STATE_CORRECT,
-            matching=False,
-            substrs=["Condition:"])
-
-        # Now run the program again.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The process should be stopped at this point.
-        self.expect("process status", PROCESS_STOPPED,
-                    patterns=['Process .* stopped'])
-
-        # 'frame variable --show-types val' should return 1 since it is the first breakpoint hit.
-        self.expect(
-            "frame variable --show-types val",
-            VARIABLES_DISPLAYED_CORRECTLY,
-            startstr='(int) val = 1')
-
-        self.runCmd("process kill")
-
-    def breakpoint_conditions_python(self):
-        """Use Python APIs to set breakpoint conditions."""
-        exe = self.getBuildArtifact("a.out")
-
-        # Create a target by the debugger.
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # Now create a breakpoint on main.c by name 'c'.
-        breakpoint = target.BreakpointCreateByName('c', 'a.out')
-        #print("breakpoint:", breakpoint)
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() == 1,
-                        VALID_BREAKPOINT)
-
-        # We didn't associate a thread index with the breakpoint, so it should
-        # be invalid.
-        self.assertTrue(breakpoint.GetThreadIndex() == lldb.UINT32_MAX,
-                        "The thread index should be invalid")
-        # The thread name should be invalid, too.
-        self.assertTrue(breakpoint.GetThreadName() is None,
-                        "The thread name should be invalid")
-
-        # Let's set the thread index for this breakpoint and verify that it is,
-        # indeed, being set correctly.
-        # There's only one thread for the process.
-        breakpoint.SetThreadIndex(1)
-        self.assertTrue(breakpoint.GetThreadIndex() == 1,
-                        "The thread index has been set correctly")
-
-        # Get the breakpoint location from breakpoint after we verified that,
-        # indeed, it has one location.
-        location = breakpoint.GetLocationAtIndex(0)
-        self.assertTrue(location and
-                        location.IsEnabled(),
-                        VALID_BREAKPOINT_LOCATION)
-
-        # Set the condition on the breakpoint location.
-        location.SetCondition('val == 3')
-        self.expect(location.GetCondition(), exe=False,
-                    startstr='val == 3')
-
-        # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        # Frame #0 should be on self.line1 and the break condition should hold.
-        from lldbsuite.test.lldbutil import get_stopped_thread
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint condition")
-        frame0 = thread.GetFrameAtIndex(0)
-        var = frame0.FindValue('val', lldb.eValueTypeVariableArgument)
-        self.assertTrue(frame0.GetLineEntry().GetLine() == self.line1 and
-                        var.GetValue() == '3')
-
-        # The hit count for the breakpoint should be 1.
-        self.assertTrue(breakpoint.GetHitCount() == 1)
-
-        # Test that the condition expression didn't create a result variable:
-        options = lldb.SBExpressionOptions()
-        value = frame0.EvaluateExpression("$0", options)
-        self.assertTrue(value.GetError().Fail(),
-                        "Conditions should not make result variables.")
-        process.Continue()
-
-    def breakpoint_invalid_conditions_python(self):
-        """Use Python APIs to set breakpoint conditions."""
-        exe = self.getBuildArtifact("a.out")
-
-        # Create a target by the debugger.
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # Now create a breakpoint on main.c by name 'c'.
-        breakpoint = target.BreakpointCreateByName('c', 'a.out')
-        #print("breakpoint:", breakpoint)
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() == 1,
-                        VALID_BREAKPOINT)
-
-        # Set the condition on the breakpoint.
-        breakpoint.SetCondition('no_such_variable == not_this_one_either')
-        self.expect(breakpoint.GetCondition(), exe=False,
-                    startstr='no_such_variable == not_this_one_either')
-
-        # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        # Frame #0 should be on self.line1 and the break condition should hold.
-        from lldbsuite.test.lldbutil import get_stopped_thread
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint condition")
-        frame0 = thread.GetFrameAtIndex(0)
-        var = frame0.FindValue('val', lldb.eValueTypeVariableArgument)
-        self.assertTrue(frame0.GetLineEntry().GetLine() == self.line1)
-
-        # The hit count for the breakpoint should be 1.
-        self.assertTrue(breakpoint.GetHitCount() == 1)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c
deleted file mode 100644
index c830b17a3ce..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include <stdio.h>
-
-// This simple program is to demonstrate the capability of the lldb command
-// "breakpoint modify -c 'val == 3' breakpt-id" to break within c(int val) only
-// when the value of the arg is 3.
-
-int a(int);
-int b(int);
-int c(int);
-
-int a(int val)
-{
-    if (val <= 1)
-        return b(val);
-    else if (val >= 3)
-        return c(val); // Find the line number of c's parent call here.
-
-    return val;
-}
-
-int b(int val)
-{
-    return c(val);
-}
-
-int c(int val)
-{
-    return val + 3; // Find the line number of function "c" here.
-}
-
-int main (int argc, char const *argv[])
-{
-    int A1 = a(1);  // a(1) -> b(1) -> c(1)
-    printf("a(1) returns %d\n", A1);
-    
-    int B2 = b(2);  // b(2) -> c(2)
-    printf("b(2) returns %d\n", B2);
-    
-    int A3 = a(3);  // a(3) -> c(3)
-    printf("a(3) returns %d\n", A3);
-
-    for (int i = 0; i < 2; ++i)
-        printf("Loop\n");
-    
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
deleted file mode 100644
index 6f696be8324..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/TestBreakpointHitCount.py
+++ /dev/null
@@ -1,134 +0,0 @@
-"""
-Test breakpoint hit count features.
-"""
-
-from __future__ import print_function
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointHitCountTestCase(TestBase):
-
-    NO_DEBUG_INFO_TESTCASE = True
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @add_test_categories(['pyapi'])
-    def test_breakpoint_location_hit_count(self):
-        """Use Python APIs to check breakpoint hit count."""
-        self.build()
-        self.do_test_breakpoint_location_hit_count()
-
-    def test_breakpoint_one_shot(self):
-        """Check that one-shot breakpoints trigger only once."""
-        self.build()
-
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        self.runCmd("tb a")
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        from lldbsuite.test.lldbutil import get_stopped_thread
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint")
-
-        frame0 = thread.GetFrameAtIndex(0)
-        self.assertTrue(frame0.GetFunctionName() == "a(int)" or frame0.GetFunctionName() == "int a(int)");
-
-        process.Continue()
-        self.assertEqual(process.GetState(), lldb.eStateExited)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        self.a_int_body_line_no = line_number(
-            'main.cpp', '// Breakpoint Location 1')
-        self.a_float_body_line_no = line_number(
-            'main.cpp', '// Breakpoint Location 2')
-
-    def do_test_breakpoint_location_hit_count(self):
-        """Use Python APIs to check breakpoint hit count."""
-        exe = self.getBuildArtifact("a.out")
-
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # Create a breakpoint in main.cpp by name 'a',
-        # there should be two locations.
-        breakpoint = target.BreakpointCreateByName('a', 'a.out')
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() == 2,
-                        VALID_BREAKPOINT)
-
-        # Verify all breakpoint locations are enabled.
-        location1 = breakpoint.GetLocationAtIndex(0)
-        self.assertTrue(location1 and
-                        location1.IsEnabled(),
-                        VALID_BREAKPOINT_LOCATION)
-
-        location2 = breakpoint.GetLocationAtIndex(1)
-        self.assertTrue(location2 and
-                        location2.IsEnabled(),
-                        VALID_BREAKPOINT_LOCATION)
-
-        # Launch the process, and do not stop at entry point.
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        # Verify 1st breakpoint location is hit.
-        from lldbsuite.test.lldbutil import get_stopped_thread
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint")
-
-        frame0 = thread.GetFrameAtIndex(0)
-        location1 = breakpoint.FindLocationByAddress(frame0.GetPC())
-        self.assertTrue(
-            frame0.GetLineEntry().GetLine() == self.a_int_body_line_no,
-            "Stopped in int a(int)")
-        self.assertTrue(location1)
-        self.assertEqual(location1.GetHitCount(), 1)
-        self.assertEqual(breakpoint.GetHitCount(), 1)
-
-        process.Continue()
-
-        # Verify 2nd breakpoint location is hit.
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint")
-
-        frame0 = thread.GetFrameAtIndex(0)
-        location2 = breakpoint.FindLocationByAddress(frame0.GetPC())
-        self.assertTrue(
-            frame0.GetLineEntry().GetLine() == self.a_float_body_line_no,
-            "Stopped in float a(float)")
-        self.assertTrue(location2)
-        self.assertEqual(location2.GetHitCount(), 1)
-        self.assertEqual(location1.GetHitCount(), 1)
-        self.assertEqual(breakpoint.GetHitCount(), 2)
-
-        process.Continue()
-
-        # Verify 2nd breakpoint location is hit again.
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint")
-
-        self.assertEqual(location2.GetHitCount(), 2)
-        self.assertEqual(location1.GetHitCount(), 1)
-        self.assertEqual(breakpoint.GetHitCount(), 3)
-
-        process.Continue()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/main.cpp
deleted file mode 100644
index 9fc133f2400..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_hit_count/main.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-int a(int val)
-{
-   return val; // Breakpoint Location 1
-}
-
-float a(float val)
-{
-    return val; // Breakpoint Location 2
-}
-
-int main (int argc, char const *argv[])
-{
-    int A1 = a(1);
-    float A2 = a(2.0f);
-    float A3 = a(3.0f);
-
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
deleted file mode 100644
index f89b52a972e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
deleted file mode 100644
index 8386ea17267..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-Test lldb breakpoint ids.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class BreakpointIDTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test(self):
-        self.build()
-
-        exe = self.getBuildArtifact("a.out")
-        self.expect("file " + exe,
-                    patterns=["Current executable set to .*a.out"])
-
-        bpno = lldbutil.run_break_set_by_symbol(
-            self, 'product', num_expected_locations=-1, sym_exact=False)
-        self.assertTrue(bpno == 1, "First breakpoint number is 1.")
-
-        bpno = lldbutil.run_break_set_by_symbol(
-            self, 'sum', num_expected_locations=-1, sym_exact=False)
-        self.assertTrue(bpno == 2, "Second breakpoint number is 2.")
-
-        bpno = lldbutil.run_break_set_by_symbol(
-            self, 'junk', num_expected_locations=0, sym_exact=False)
-        self.assertTrue(bpno == 3, "Third breakpoint number is 3.")
-
-        self.expect(
-            "breakpoint disable 1.1 - 2.2 ",
-            COMMAND_FAILED_AS_EXPECTED,
-            error=True,
-            startstr="error: Invalid range: Ranges that specify particular breakpoint locations must be within the same major breakpoint; you specified two different major breakpoints, 1 and 2.")
-
-        self.expect(
-            "breakpoint disable 2 - 2.2",
-            COMMAND_FAILED_AS_EXPECTED,
-            error=True,
-            startstr="error: Invalid breakpoint id range:  Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
-
-        self.expect(
-            "breakpoint disable 2.1 - 2",
-            COMMAND_FAILED_AS_EXPECTED,
-            error=True,
-            startstr="error: Invalid breakpoint id range:  Either both ends of range must specify a breakpoint location, or neither can specify a breakpoint location.")
-
-        self.expect("breakpoint disable 2.1 - 2.2",
-                    startstr="2 breakpoints disabled.")
-
-        self.expect("breakpoint enable 2.*",
-                    patterns=[".* breakpoints enabled."])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp
deleted file mode 100644
index 3c98e147f22..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstdlib>
-#include <string>
-#include <fstream>
-#include <iostream>
-
-
-#define INLINE inline __attribute__((always_inline))
-
-INLINE int
-product (int x, int y)
-{
-    int result = x * y;
-    return result;
-}
-
-INLINE int
-sum (int a, int b)
-{
-    int result = a + b;
-    return result;
-}
-
-int
-strange_max (int m, int n)
-{
-    if (m > n)
-        return m;
-    else if (n > m)
-        return n;
-    else
-        return 0;
-}
-
-int
-foo (int i, int j)
-{
-    if (strange_max (i, j) == i)
-        return product (i, j);
-    else if (strange_max  (i, j) == j)
-        return sum (i, j);
-    else
-        return product (sum (i, i), sum (j, j));
-}
-
-int
-main(int argc, char const *argv[])
-{
-
-    int array[3];
-
-    array[0] = foo (1238, 78392);
-    array[1] = foo (379265, 23674);
-    array[2] = foo (872934, 234);
-
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
deleted file mode 100644
index 12c8068b419..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ /dev/null
@@ -1,151 +0,0 @@
-"""
-Test breakpoint ignore count features.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointIgnoreCountTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipIfWindows # This test will hang on windows llvm.org/pr21753
-    def test_with_run_command(self):
-        """Exercise breakpoint ignore count with 'breakpoint set -i <count>'."""
-        self.build()
-        self.breakpoint_ignore_count()
-
-    @add_test_categories(['pyapi'])
-    @skipIfWindows # This test will hang on windows llvm.org/pr21753
-    def test_with_python_api(self):
-        """Use Python APIs to set breakpoint ignore count."""
-        self.build()
-        self.breakpoint_ignore_count_python()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to of function 'c'.
-        self.line1 = line_number(
-            'main.c', '// Find the line number of function "c" here.')
-        self.line2 = line_number(
-            'main.c', '// b(2) -> c(2) Find the call site of b(2).')
-        self.line3 = line_number(
-            'main.c', '// a(3) -> c(3) Find the call site of c(3).')
-        self.line4 = line_number(
-            'main.c', '// a(3) -> c(3) Find the call site of a(3).')
-        self.line5 = line_number(
-            'main.c', '// Find the call site of c in main.')
-
-    def breakpoint_ignore_count(self):
-        """Exercise breakpoint ignore count with 'breakpoint set -i <count>'."""
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # Create a breakpoint in main.c at line1.
-        lldbutil.run_break_set_by_file_and_line(
-            self,
-            'main.c',
-            self.line1,
-            extra_options='-i 1',
-            num_expected_locations=1,
-            loc_exact=True)
-
-        # Now run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The process should be stopped at this point.
-        self.expect("process status", PROCESS_STOPPED,
-                    patterns=['Process .* stopped'])
-
-        # Also check the hit count, which should be 2, due to ignore count of
-        # 1.
-        self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE,
-                    substrs=["resolved = 1",
-                             "hit count = 2"])
-
-        # The frame #0 should correspond to main.c:37, the executable statement
-        # in function name 'c'.  And frame #2 should point to main.c:45.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_IGNORE_COUNT,
-                    #substrs = ["stop reason = breakpoint"],
-                    patterns=["frame #0.*main.c:%d" % self.line1,
-                              "frame #2.*main.c:%d" % self.line2])
-
-        # continue -i 1 is the same as setting the ignore count to 1 again, try that:
-        # Now run the program.
-        self.runCmd("process continue -i 1", RUN_SUCCEEDED)
-
-        # The process should be stopped at this point.
-        self.expect("process status", PROCESS_STOPPED,
-                    patterns=['Process .* stopped'])
-
-        # Also check the hit count, which should be 2, due to ignore count of
-        # 1.
-        self.expect("breakpoint list -f", BREAKPOINT_HIT_THRICE,
-                    substrs=["resolved = 1",
-                             "hit count = 4"])
-
-        # The frame #0 should correspond to main.c:37, the executable statement
-        # in function name 'c'.  And frame #2 should point to main.c:45.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT_IGNORE_COUNT,
-                    #substrs = ["stop reason = breakpoint"],
-                    patterns=["frame #0.*main.c:%d" % self.line1,
-                              "frame #1.*main.c:%d" % self.line5])
-
-    def breakpoint_ignore_count_python(self):
-        """Use Python APIs to set breakpoint ignore count."""
-        exe = self.getBuildArtifact("a.out")
-
-        # Create a target by the debugger.
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # Now create a breakpoint on main.c by name 'c'.
-        breakpoint = target.BreakpointCreateByName('c', 'a.out')
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() == 1,
-                        VALID_BREAKPOINT)
-
-        # Get the breakpoint location from breakpoint after we verified that,
-        # indeed, it has one location.
-        location = breakpoint.GetLocationAtIndex(0)
-        self.assertTrue(location and
-                        location.IsEnabled(),
-                        VALID_BREAKPOINT_LOCATION)
-
-        # Set the ignore count on the breakpoint location.
-        location.SetIgnoreCount(2)
-        self.assertTrue(location.GetIgnoreCount() == 2,
-                        "SetIgnoreCount() works correctly")
-
-        # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        # Frame#0 should be on main.c:37, frame#1 should be on main.c:25, and
-        # frame#2 should be on main.c:48.
-        # lldbutil.print_stacktraces(process)
-        from lldbsuite.test.lldbutil import get_stopped_thread
-        thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint)
-        self.assertTrue(
-            thread.IsValid(),
-            "There should be a thread stopped due to breakpoint")
-        frame0 = thread.GetFrameAtIndex(0)
-        frame1 = thread.GetFrameAtIndex(1)
-        frame2 = thread.GetFrameAtIndex(2)
-        self.assertTrue(frame0.GetLineEntry().GetLine() == self.line1 and
-                        frame1.GetLineEntry().GetLine() == self.line3 and
-                        frame2.GetLineEntry().GetLine() == self.line4,
-                        STOPPED_DUE_TO_BREAKPOINT_IGNORE_COUNT)
-
-        # The hit count for the breakpoint should be 3.
-        self.assertTrue(breakpoint.GetHitCount() == 3)
-
-        process.Continue()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
deleted file mode 100644
index b1ed4465c1d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include <stdio.h>
-
-// This simple program is to demonstrate the capability of the lldb command
-// "breakpoint modify -i <count> breakpt-id" to set the number of times a
-// breakpoint is skipped before stopping.  Ignore count can also be set upon
-// breakpoint creation by 'breakpoint set ... -i <count>'.
-
-int a(int);
-int b(int);
-int c(int);
-
-int a(int val)
-{
-    if (val <= 1)
-        return b(val);
-    else if (val >= 3)
-        return c(val); // a(3) -> c(3) Find the call site of c(3).
-
-    return val;
-}
-
-int b(int val)
-{
-    return c(val);
-}
-
-int c(int val)
-{
-    return val + 3; // Find the line number of function "c" here.
-}
-
-int main (int argc, char const *argv[])
-{
-    int A1 = a(1);  // a(1) -> b(1) -> c(1)
-    printf("a(1) returns %d\n", A1);
-    
-    int B2 = b(2);  // b(2) -> c(2) Find the call site of b(2).
-    printf("b(2) returns %d\n", B2);
-    
-    int A3 = a(3);  // a(3) -> c(3) Find the call site of a(3).
-    printf("a(3) returns %d\n", A3);
-    
-    int C1 = c(5); // Find the call site of c in main.
-    printf ("c(5) returns %d\n", C1);
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/Makefile
deleted file mode 100644
index 77aa24afc0f..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
deleted file mode 100644
index ff087159f61..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/TestAvoidBreakpointInDelaySlot.py
+++ /dev/null
@@ -1,87 +0,0 @@
-"""
-Test specific to MIPS
-"""
-
-from __future__ import print_function
-
-import re
-import unittest2
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class AvoidBreakpointInDelaySlotAPITestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipIf(archs=no_match(re.compile('mips*')))
-    def test(self):
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        self.expect("file " + exe,
-                    patterns=["Current executable set to .*a.out.*"])
-
-        # Create a target by the debugger.
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        breakpoint = target.BreakpointCreateByName('main', 'a.out')
-        self.assertTrue(breakpoint and
-                        breakpoint.GetNumLocations() == 1,
-                        VALID_BREAKPOINT)
-
-        # Now launch the process, and do not stop at entry point.
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        list = target.FindFunctions('foo', lldb.eFunctionNameTypeAuto)
-        self.assertTrue(list.GetSize() == 1)
-        sc = list.GetContextAtIndex(0)
-        self.assertTrue(sc.GetSymbol().GetName() == "foo")
-        function = sc.GetFunction()
-        self.assertTrue(function)
-        self.function(function, target)
-
-    def function(self, function, target):
-        """Iterate over instructions in function and place a breakpoint on delay slot instruction"""
-        # Get the list of all instructions in the function
-        insts = function.GetInstructions(target)
-        print(insts)
-        i = 0
-        for inst in insts:
-            if (inst.HasDelaySlot()):
-                # Remember the address of branch instruction.
-                branchinstaddress = inst.GetAddress().GetLoadAddress(target)
-
-                # Get next instruction i.e delay slot instruction.
-                delayinst = insts.GetInstructionAtIndex(i + 1)
-                delayinstaddr = delayinst.GetAddress().GetLoadAddress(target)
-
-                # Set breakpoint on delay slot instruction
-                breakpoint = target.BreakpointCreateByAddress(delayinstaddr)
-
-                # Verify the breakpoint.
-                self.assertTrue(breakpoint and
-                                breakpoint.GetNumLocations() == 1,
-                                VALID_BREAKPOINT)
-                # Get the location from breakpoint
-                location = breakpoint.GetLocationAtIndex(0)
-
-                # Get the address where breakpoint is actually set.
-                bpaddr = location.GetLoadAddress()
-
-                # Breakpoint address should be adjusted to the address of
-                # branch instruction.
-                self.assertTrue(branchinstaddress == bpaddr)
-                i += 1
-            else:
-                i += 1
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest2.main()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/main.c
deleted file mode 100644
index bc3eceea769..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_in_delayslot/main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-foo (int a, int b)
-{
-    int c;
-    if (a<=b)
-        c=b-a;
-    else
-        c=b+a;
-    return c;
-}
-
-int main()
-{
-    int a=7, b=8, c;
-    
-    c = foo(a, b);
-
-return 0;
-}
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/Makefile
deleted file mode 100644
index 4f6b058fa32..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := a.c
-CXX_SOURCES := main.cpp b.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
deleted file mode 100644
index c22d22fe282..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/TestBreakpointLanguage.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""
-Test that the language option for breakpoints works correctly
-parser.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class TestBreakpointLanguage(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-
-    def check_location_file(self, bp, loc, test_name):
-        bp_loc = bp.GetLocationAtIndex(loc)
-        addr = bp_loc.GetAddress()
-        comp_unit = addr.GetCompileUnit()
-        comp_name = comp_unit.GetFileSpec().GetFilename()
-        return comp_name == test_name
-
-    def test_regex_breakpoint_language(self):
-        """Test that the name regex breakpoint commands obey the language filter."""
-
-        self.build()
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        error = lldb.SBError()
-        # Don't read in dependencies so we don't come across false matches that
-        # add unwanted breakpoint hits.
-        self.target = self.dbg.CreateTarget(exe, None, None, False, error)
-        self.assertTrue(self.target, VALID_TARGET)
-
-        cpp_bp = self.target.BreakpointCreateByRegex(
-            "func_from",
-            lldb.eLanguageTypeC_plus_plus,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            cpp_bp.GetNumLocations() == 1,
-            "Only one C++ symbol matches")
-        self.assertTrue(self.check_location_file(cpp_bp, 0, "b.cpp"))
-
-        c_bp = self.target.BreakpointCreateByRegex(
-            "func_from",
-            lldb.eLanguageTypeC,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            c_bp.GetNumLocations() == 1,
-            "Only one C symbol matches")
-        self.assertTrue(self.check_location_file(c_bp, 0, "a.c"))
-
-        objc_bp = self.target.BreakpointCreateByRegex(
-            "func_from",
-            lldb.eLanguageTypeObjC,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            objc_bp.GetNumLocations() == 0,
-            "No ObjC symbol matches")
-
-    def test_by_name_breakpoint_language(self):
-        """Test that the name regex breakpoint commands obey the language filter."""
-
-        self.build()
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        error = lldb.SBError()
-        # Don't read in dependencies so we don't come across false matches that
-        # add unwanted breakpoint hits.
-        self.target = self.dbg.CreateTarget(exe, None, None, False, error)
-        self.assertTrue(self.target, VALID_TARGET)
-
-        cpp_bp = self.target.BreakpointCreateByName(
-            "func_from_cpp",
-            lldb.eFunctionNameTypeAuto,
-            lldb.eLanguageTypeC_plus_plus,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            cpp_bp.GetNumLocations() == 1,
-            "Only one C++ symbol matches")
-        self.assertTrue(self.check_location_file(cpp_bp, 0, "b.cpp"))
-
-        no_cpp_bp = self.target.BreakpointCreateByName(
-            "func_from_c",
-            lldb.eFunctionNameTypeAuto,
-            lldb.eLanguageTypeC_plus_plus,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            no_cpp_bp.GetNumLocations() == 0,
-            "And the C one doesn't match")
-
-        c_bp = self.target.BreakpointCreateByName(
-            "func_from_c",
-            lldb.eFunctionNameTypeAuto,
-            lldb.eLanguageTypeC,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            c_bp.GetNumLocations() == 1,
-            "Only one C symbol matches")
-        self.assertTrue(self.check_location_file(c_bp, 0, "a.c"))
-
-        no_c_bp = self.target.BreakpointCreateByName(
-            "func_from_cpp",
-            lldb.eFunctionNameTypeAuto,
-            lldb.eLanguageTypeC,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            no_c_bp.GetNumLocations() == 0,
-            "And the C++ one doesn't match")
-
-        objc_bp = self.target.BreakpointCreateByName(
-            "func_from_cpp",
-            lldb.eFunctionNameTypeAuto,
-            lldb.eLanguageTypeObjC,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            objc_bp.GetNumLocations() == 0,
-            "No ObjC symbol matches")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/a.c
deleted file mode 100644
index b90e2bdcca5..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/a.c
+++ /dev/null
@@ -1,5 +0,0 @@
-int 
-func_from_c ()
-{
-  return 5;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/b.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/b.cpp
deleted file mode 100644
index 89373445b9a..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/b.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-int
-func_from_cpp()
-{
-    return 10;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/main.cpp
deleted file mode 100644
index b7d00a60202..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_language/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-extern "C" int func_from_c();
-extern int func_from_cpp();
-
-int
-main()
-{
-    func_from_c();
-    func_from_cpp();
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
deleted file mode 100644
index 7934cd5db42..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
deleted file mode 100644
index 052b125143f..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ /dev/null
@@ -1,198 +0,0 @@
-"""
-Test breakpoint commands for a breakpoint ID with multiple locations.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointLocationsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
-    def test_enable(self):
-        """Test breakpoint enable/disable for a breakpoint ID with multiple locations."""
-        self.build()
-        self.breakpoint_locations_test()
-
-    def test_shadowed_cond_options(self):
-        """Test that options set on the breakpoint and location behave correctly."""
-        self.build()
-        self.shadowed_bkpt_cond_test()
-
-
-    def test_shadowed_command_options(self):
-        """Test that options set on the breakpoint and location behave correctly."""
-        self.build()
-        self.shadowed_bkpt_command_test()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line = line_number('main.c', '// Set break point at this line.')
-
-    def set_breakpoint (self):
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, "Target %s is not valid"%(exe))
-
-        # This should create a breakpoint with 3 locations.
-
-        bkpt = target.BreakpointCreateByLocation("main.c", self.line)
-
-        # The breakpoint list should show 3 locations.
-        self.assertEqual(bkpt.GetNumLocations(), 3, "Wrong number of locations")
-
-        self.expect(
-            "breakpoint list -f",
-            "Breakpoint locations shown correctly",
-            substrs=[
-                "1: file = 'main.c', line = %d, exact_match = 0, locations = 3" %
-                self.line],
-            patterns=[
-                "where = a.out`func_inlined .+unresolved, hit count = 0",
-                "where = a.out`main .+\[inlined\].+unresolved, hit count = 0"])
-
-        return bkpt
-
-    def shadowed_bkpt_cond_test(self):
-        """Test that options set on the breakpoint and location behave correctly."""
-        # Breakpoint option propagation from bkpt to loc used to be done the first time
-        # a breakpoint location option was specifically set.  After that the other options
-        # on that location would stop tracking the breakpoint.  That got fixed, and this test
-        # makes sure only the option touched is affected.
-
-        bkpt = self.set_breakpoint()
-        bkpt_cond = "1 == 0"
-        bkpt.SetCondition(bkpt_cond)
-        self.assertEqual(bkpt.GetCondition(), bkpt_cond,"Successfully set condition")
-        self.assertTrue(bkpt.location[0].GetCondition() == bkpt.GetCondition(), "Conditions are the same")
-
-        # Now set a condition on the locations, make sure that this doesn't effect the bkpt:
-        bkpt_loc_1_cond = "1 == 1"
-        bkpt.location[0].SetCondition(bkpt_loc_1_cond)
-        self.assertEqual(bkpt.location[0].GetCondition(), bkpt_loc_1_cond, "Successfully changed location condition")
-        self.assertNotEqual(bkpt.GetCondition(), bkpt_loc_1_cond, "Changed location changed Breakpoint condition")
-        self.assertEqual(bkpt.location[1].GetCondition(), bkpt_cond, "Changed another location's condition")
-
-        # Now make sure that setting one options doesn't fix the value of another:
-        bkpt.SetIgnoreCount(10)
-        self.assertEqual(bkpt.GetIgnoreCount(), 10, "Set the ignore count successfully")
-        self.assertEqual(bkpt.location[0].GetIgnoreCount(), 10, "Location doesn't track top-level bkpt.")
-
-        # Now make sure resetting the condition to "" resets the tracking:
-        bkpt.location[0].SetCondition("")
-        bkpt_new_cond = "1 == 3"
-        bkpt.SetCondition(bkpt_new_cond)
-        self.assertEqual(bkpt.location[0].GetCondition(), bkpt_new_cond, "Didn't go back to tracking condition")
-
-    def shadowed_bkpt_command_test(self):
-        """Test that options set on the breakpoint and location behave correctly."""
-        # Breakpoint option propagation from bkpt to loc used to be done the first time
-        # a breakpoint location option was specifically set.  After that the other options
-        # on that location would stop tracking the breakpoint.  That got fixed, and this test
-        # makes sure only the option touched is affected.
-
-        bkpt = self.set_breakpoint()
-        commands = ["AAAAAA", "BBBBBB", "CCCCCC"]
-        str_list = lldb.SBStringList()
-        str_list.AppendList(commands, len(commands))
-
-        bkpt.SetCommandLineCommands(str_list)
-        cmd_list = lldb.SBStringList()
-        bkpt.GetCommandLineCommands(cmd_list)
-        list_size = str_list.GetSize()
-        self.assertEqual(cmd_list.GetSize() , list_size, "Added the right number of commands")
-        for i in range(0,list_size):
-            self.assertEqual(str_list.GetStringAtIndex(i), cmd_list.GetStringAtIndex(i), "Mismatched commands.")
-
-        commands = ["DDDDDD", "EEEEEE", "FFFFFF", "GGGGGG"]
-        loc_list = lldb.SBStringList()
-        loc_list.AppendList(commands, len(commands))
-        bkpt.location[1].SetCommandLineCommands(loc_list)
-        loc_cmd_list = lldb.SBStringList()
-        bkpt.location[1].GetCommandLineCommands(loc_cmd_list)
-
-        loc_list_size = loc_list.GetSize()
-
-        # Check that the location has the right commands:
-        self.assertEqual(loc_cmd_list.GetSize() , loc_list_size, "Added the right number of commands to location")
-        for i in range(0,loc_list_size):
-            self.assertEqual(loc_list.GetStringAtIndex(i), loc_cmd_list.GetStringAtIndex(i), "Mismatched commands.")
-
-        # Check that we didn't mess up the breakpoint level commands:
-        self.assertEqual(cmd_list.GetSize() , list_size, "Added the right number of commands")
-        for i in range(0,list_size):
-            self.assertEqual(str_list.GetStringAtIndex(i), cmd_list.GetStringAtIndex(i), "Mismatched commands.")
-
-        # And check we didn't mess up another location:
-        untouched_loc_cmds = lldb.SBStringList()
-        bkpt.location[0].GetCommandLineCommands(untouched_loc_cmds)
-        self.assertEqual(untouched_loc_cmds.GetSize() , 0, "Changed the wrong location")
-
-    def breakpoint_locations_test(self):
-        """Test breakpoint enable/disable for a breakpoint ID with multiple locations."""
-        self.set_breakpoint()
-
-        # The 'breakpoint disable 3.*' command should fail gracefully.
-        self.expect("breakpoint disable 3.*",
-                    "Disabling an invalid breakpoint should fail gracefully",
-                    error=True,
-                    startstr="error: '3' is not a valid breakpoint ID.")
-
-        # The 'breakpoint disable 1.*' command should disable all 3 locations.
-        self.expect(
-            "breakpoint disable 1.*",
-            "All 3 breakpoint locatons disabled correctly",
-            startstr="3 breakpoints disabled.")
-
-        # Run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # We should not stopped on any breakpoint at all.
-        self.expect("process status", "No stopping on any disabled breakpoint",
-                    patterns=["^Process [0-9]+ exited with status = 0"])
-
-        # The 'breakpoint enable 1.*' command should enable all 3 breakpoints.
-        self.expect(
-            "breakpoint enable 1.*",
-            "All 3 breakpoint locatons enabled correctly",
-            startstr="3 breakpoints enabled.")
-
-        # The 'breakpoint disable 1.1' command should disable 1 location.
-        self.expect(
-            "breakpoint disable 1.1",
-            "1 breakpoint locatons disabled correctly",
-            startstr="1 breakpoints disabled.")
-
-        # Run the program again.  We should stop on the two breakpoint
-        # locations.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # Stopped once.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 1."])
-
-        # Continue the program, there should be another stop.
-        self.runCmd("process continue")
-
-        # Stopped again.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 1."])
-
-        # At this point, 1.1 has a hit count of 0 and the other a hit count of
-        # 1".
-        self.expect(
-            "breakpoint list -f",
-            "The breakpoints should report correct hit counts",
-            patterns=[
-                "1\.1: .+ unresolved, hit count = 0 +Options: disabled",
-                "1\.2: .+ resolved, hit count = 1",
-                "1\.3: .+ resolved, hit count = 1"])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c
deleted file mode 100644
index 7ec3ded67b7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c
+++ /dev/null
@@ -1,43 +0,0 @@
-#include <stdio.h>
-
-#define INLINE inline __attribute__((always_inline))
-
-int
-func_not_inlined (void)
-{
-    printf ("Called func_not_inlined.\n");
-    return 0;
-}
-
-INLINE int
-func_inlined (void)
-{
-    static int func_inline_call_count = 0;
-    printf ("Called func_inlined.\n");
-    ++func_inline_call_count;
-    printf ("Returning func_inlined call count: %d.\n", func_inline_call_count);
-    return func_inline_call_count; // Set break point at this line.
-}
-
-extern int func_inlined (void);
-
-int
-main (int argc, char **argv)
-{
-  printf ("Starting...\n");
-
-  int (*func_ptr) (void);
-  func_ptr = func_inlined;
-
-  int a = func_inlined();
-  printf("First call to func_inlined() returns: %d.\n", a);
-
-  func_not_inlined ();
-
-  func_ptr ();
-
-  printf("Last call to func_inlined() returns: %d.\n", func_inlined ());
-  return 0;
-}
-
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
deleted file mode 100644
index 4a5ed87e330..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/TestBreakpointNames.py
+++ /dev/null
@@ -1,365 +0,0 @@
-"""
-Test breakpoint names.
-"""
-
-from __future__ import print_function
-
-
-import os
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointNames(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    NO_DEBUG_INFO_TESTCASE = True
-
-    @add_test_categories(['pyapi'])
-    def test_setting_names(self):
-        """Use Python APIs to test that we can set breakpoint names."""
-        self.build()
-        self.setup_target()
-        self.do_check_names()
-
-    def test_illegal_names(self):
-        """Use Python APIs to test that we don't allow illegal names."""
-        self.build()
-        self.setup_target()
-        self.do_check_illegal_names()
-
-    def test_using_names(self):
-        """Use Python APIs to test that operations on names works correctly."""
-        self.build()
-        self.setup_target()
-        self.do_check_using_names()
-
-    def test_configuring_names(self):
-        """Use Python APIs to test that configuring options on breakpoint names works correctly."""
-        self.build()
-        self.make_a_dummy_name()
-        self.setup_target()
-        self.do_check_configuring_names()
-
-    def test_configuring_permissions_sb(self):
-        """Use Python APIs to test that configuring permissions on names works correctly."""
-        self.build()
-        self.setup_target()
-        self.do_check_configuring_permissions_sb()
-
-    def test_configuring_permissions_cli(self):
-        """Use Python APIs to test that configuring permissions on names works correctly."""
-        self.build()
-        self.setup_target()
-        self.do_check_configuring_permissions_cli()
-
-    def setup_target(self):
-        exe = self.getBuildArtifact("a.out")
-
-        # Create a targets we are making breakpoint in and copying to:
-        self.target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.target, VALID_TARGET)
-        self.main_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "main.c"))
-
-    def check_name_in_target(self, bkpt_name):
-        name_list = lldb.SBStringList()
-        self.target.GetBreakpointNames(name_list)
-        found_it = False
-        for name in name_list:
-            if name == bkpt_name:
-                found_it = True
-                break
-        self.assertTrue(found_it, "Didn't find the name %s in the target's name list:"%(bkpt_name))
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-        # These are the settings we're going to be putting into names & breakpoints:
-        self.bp_name_string = "ABreakpoint"
-        self.is_one_shot = True
-        self.ignore_count = 1000
-        self.condition = "1 == 2"
-        self.auto_continue = True
-        self.tid = 0xaaaa
-        self.tidx = 10
-        self.thread_name = "Fooey"
-        self.queue_name = "Blooey"
-        self.cmd_list = lldb.SBStringList()
-        self.cmd_list.AppendString("frame var")
-        self.cmd_list.AppendString("bt")
-        self.help_string = "I do something interesting"
-
-
-    def do_check_names(self):
-        """Use Python APIs to check that we can set & retrieve breakpoint names"""
-        bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        bkpt_name = "ABreakpoint"
-        other_bkpt_name = "_AnotherBreakpoint"
-
-        # Add a name and make sure we match it:
-        success = bkpt.AddName(bkpt_name)
-        self.assertTrue(success, "We couldn't add a legal name to a breakpoint.")
-
-        matches = bkpt.MatchesName(bkpt_name)
-        self.assertTrue(matches, "We didn't match the name we just set")
-
-        # Make sure we don't match irrelevant names:
-        matches = bkpt.MatchesName("NotABreakpoint")
-        self.assertTrue(not matches, "We matched a name we didn't set.")
-
-        # Make sure the name is also in the target:
-        self.check_name_in_target(bkpt_name)
-
-        # Add another name, make sure that works too:
-        bkpt.AddName(other_bkpt_name)
-
-        matches = bkpt.MatchesName(bkpt_name)
-        self.assertTrue(matches, "Adding a name means we didn't match the name we just set")
-        self.check_name_in_target(other_bkpt_name)
-
-        # Remove the name and make sure we no longer match it:
-        bkpt.RemoveName(bkpt_name)
-        matches = bkpt.MatchesName(bkpt_name)
-        self.assertTrue(not matches,"We still match a name after removing it.")
-
-        # Make sure the name list has the remaining name:
-        name_list = lldb.SBStringList()
-        bkpt.GetNames(name_list)
-        num_names = name_list.GetSize()
-        self.assertTrue(num_names == 1, "Name list has %d items, expected 1."%(num_names))
-
-        name = name_list.GetStringAtIndex(0)
-        self.assertTrue(name == other_bkpt_name, "Remaining name was: %s expected %s."%(name, other_bkpt_name))
-
-    def do_check_illegal_names(self):
-        """Use Python APIs to check that we reject illegal names."""
-        bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        bad_names = ["-CantStartWithADash",
-                     "1CantStartWithANumber",
-                     "^CantStartWithNonAlpha",
-                     "CantHave-ADash",
-                     "Cant Have Spaces"]
-        for bad_name in bad_names:
-            success = bkpt.AddName(bad_name)
-            self.assertTrue(not success,"We allowed an illegal name: %s"%(bad_name))
-            bp_name = lldb.SBBreakpointName(self.target, bad_name)
-            self.assertFalse(bp_name.IsValid(), "We made a breakpoint name with an illegal name: %s"%(bad_name));
-
-            retval =lldb.SBCommandReturnObject()
-            self.dbg.GetCommandInterpreter().HandleCommand("break set -n whatever -N '%s'"%(bad_name), retval)
-            self.assertTrue(not retval.Succeeded(), "break set succeeded with: illegal name: %s"%(bad_name))
-
-    def do_check_using_names(self):
-        """Use Python APIs to check names work in place of breakpoint ID's."""
-
-        bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        bkpt_name = "ABreakpoint"
-        other_bkpt_name= "_AnotherBreakpoint"
-
-        # Add a name and make sure we match it:
-        success = bkpt.AddName(bkpt_name)
-        self.assertTrue(success, "We couldn't add a legal name to a breakpoint.")
-
-        bkpts = lldb.SBBreakpointList(self.target)
-        self.target.FindBreakpointsByName(bkpt_name, bkpts)
-
-        self.assertTrue(bkpts.GetSize() == 1, "One breakpoint matched.")
-        found_bkpt = bkpts.GetBreakpointAtIndex(0)
-        self.assertTrue(bkpt.GetID() == found_bkpt.GetID(),"The right breakpoint.")
-
-        retval = lldb.SBCommandReturnObject()
-        self.dbg.GetCommandInterpreter().HandleCommand("break disable %s"%(bkpt_name), retval)
-        self.assertTrue(retval.Succeeded(), "break disable failed with: %s."%(retval.GetError()))
-        self.assertTrue(not bkpt.IsEnabled(), "We didn't disable the breakpoint.")
-
-        # Also make sure we don't apply commands to non-matching names:
-        self.dbg.GetCommandInterpreter().HandleCommand("break modify --one-shot 1 %s"%(other_bkpt_name), retval)
-        self.assertTrue(retval.Succeeded(), "break modify failed with: %s."%(retval.GetError()))
-        self.assertTrue(not bkpt.IsOneShot(), "We applied one-shot to the wrong breakpoint.")
-
-    def check_option_values(self, bp_object):
-        self.assertEqual(bp_object.IsOneShot(), self.is_one_shot, "IsOneShot")
-        self.assertEqual(bp_object.GetIgnoreCount(), self.ignore_count, "IgnoreCount")
-        self.assertEqual(bp_object.GetCondition(), self.condition, "Condition")
-        self.assertEqual(bp_object.GetAutoContinue(), self.auto_continue, "AutoContinue")
-        self.assertEqual(bp_object.GetThreadID(), self.tid, "Thread ID")
-        self.assertEqual(bp_object.GetThreadIndex(), self.tidx, "Thread Index")
-        self.assertEqual(bp_object.GetThreadName(), self.thread_name, "Thread Name")
-        self.assertEqual(bp_object.GetQueueName(), self.queue_name, "Queue Name")
-        set_cmds = lldb.SBStringList()
-        bp_object.GetCommandLineCommands(set_cmds)
-        self.assertEqual(set_cmds.GetSize(), self.cmd_list.GetSize(), "Size of command line commands")
-        for idx in range(0, set_cmds.GetSize()):
-            self.assertEqual(self.cmd_list.GetStringAtIndex(idx), set_cmds.GetStringAtIndex(idx), "Command %d"%(idx))
-
-    def make_a_dummy_name(self):
-        "This makes a breakpoint name in the dummy target to make sure it gets copied over"
-
-        dummy_target = self.dbg.GetDummyTarget()
-        self.assertTrue(dummy_target.IsValid(), "Dummy target was not valid.")
-
-        def cleanup ():
-            self.dbg.GetDummyTarget().DeleteBreakpointName(self.bp_name_string)
-
-        # Execute the cleanup function during test case tear down.
-        self.addTearDownHook(cleanup)
-
-        # Now find it in the dummy target, and make sure these settings took:
-        bp_name = lldb.SBBreakpointName(dummy_target, self.bp_name_string)
-        # Make sure the name is right:
-        self.assertTrue (bp_name.GetName() == self.bp_name_string, "Wrong bp_name: %s"%(bp_name.GetName()))
-        bp_name.SetOneShot(self.is_one_shot)
-        bp_name.SetIgnoreCount(self.ignore_count)
-        bp_name.SetCondition(self.condition)
-        bp_name.SetAutoContinue(self.auto_continue)
-        bp_name.SetThreadID(self.tid)
-        bp_name.SetThreadIndex(self.tidx)
-        bp_name.SetThreadName(self.thread_name)
-        bp_name.SetQueueName(self.queue_name)
-        bp_name.SetCommandLineCommands(self.cmd_list)
-
-        # Now look it up again, and make sure it got set correctly.
-        bp_name = lldb.SBBreakpointName(dummy_target, self.bp_name_string)
-        self.assertTrue(bp_name.IsValid(), "Failed to make breakpoint name.")
-        self.check_option_values(bp_name)
-
-    def do_check_configuring_names(self):
-        """Use Python APIs to check that configuring breakpoint names works correctly."""
-        other_bp_name_string = "AnotherBreakpointName"
-        cl_bp_name_string = "CLBreakpointName"
-
-        # Now find the version copied in from the dummy target, and make sure these settings took:
-        bp_name = lldb.SBBreakpointName(self.target, self.bp_name_string)
-        self.assertTrue(bp_name.IsValid(), "Failed to make breakpoint name.")
-        self.check_option_values(bp_name)
-
-        # Now add this name to a breakpoint, and make sure it gets configured properly
-        bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        success = bkpt.AddName(self.bp_name_string)
-        self.assertTrue(success, "Couldn't add this name to the breakpoint")
-        self.check_option_values(bkpt)
-
-        # Now make a name from this breakpoint, and make sure the new name is properly configured:
-        new_name = lldb.SBBreakpointName(bkpt, other_bp_name_string)
-        self.assertTrue(new_name.IsValid(), "Couldn't make a valid bp_name from a breakpoint.")
-        self.check_option_values(bkpt)
-
-        # Now change the name's option and make sure it gets propagated to
-        # the breakpoint:
-        new_auto_continue = not self.auto_continue
-        bp_name.SetAutoContinue(new_auto_continue)
-        self.assertEqual(bp_name.GetAutoContinue(), new_auto_continue, "Couldn't change auto-continue on the name")
-        self.assertEqual(bkpt.GetAutoContinue(), new_auto_continue, "Option didn't propagate to the breakpoint.")
-
-        # Now make this same breakpoint name - but from the command line
-        cmd_str = "breakpoint name configure %s -o %d -i %d -c '%s' -G %d -t %d -x %d -T '%s' -q '%s' -H '%s'"%(cl_bp_name_string,
-                                                                             self.is_one_shot,
-                                                                             self.ignore_count,
-                                                                             self.condition,
-                                                                             self.auto_continue,
-                                                                             self.tid,
-                                                                             self.tidx,
-                                                                             self.thread_name,
-                                                                             self.queue_name,
-                                                                             self.help_string)
-        for cmd in self.cmd_list:
-            cmd_str += " -C '%s'"%(cmd)
-
-        self.runCmd(cmd_str, check=True)
-        # Now look up this name again and check its options:
-        cl_name = lldb.SBBreakpointName(self.target, cl_bp_name_string)
-        self.check_option_values(cl_name)
-        # Also check the help string:
-        self.assertEqual(self.help_string, cl_name.GetHelpString(), "Help string didn't match")
-        # Change the name and make sure that works:
-        new_help = "I do something even more interesting"
-        cl_name.SetHelpString(new_help)
-        self.assertEqual(new_help, cl_name.GetHelpString(), "SetHelpString didn't")
-
-        # We should have three names now, make sure the target can list them:
-        name_list = lldb.SBStringList()
-        self.target.GetBreakpointNames(name_list)
-        for name_string in [self.bp_name_string, other_bp_name_string, cl_bp_name_string]:
-            self.assertTrue(name_string in name_list, "Didn't find %s in names"%(name_string))
-
-        # Delete the name from the current target.  Make sure that works and deletes the
-        # name from the breakpoint as well:
-        self.target.DeleteBreakpointName(self.bp_name_string)
-        name_list.Clear()
-        self.target.GetBreakpointNames(name_list)
-        self.assertTrue(self.bp_name_string not in name_list, "Didn't delete %s from a real target"%(self.bp_name_string))
-        # Also make sure the name got removed from breakpoints holding it:
-        self.assertFalse(bkpt.MatchesName(self.bp_name_string), "Didn't remove the name from the breakpoint.")
-
-        # Test that deleting the name we injected into the dummy target works (there's also a
-        # cleanup that will do this, but that won't test the result...
-        dummy_target = self.dbg.GetDummyTarget()
-        dummy_target.DeleteBreakpointName(self.bp_name_string)
-        name_list.Clear()
-        dummy_target.GetBreakpointNames(name_list)
-        self.assertTrue(self.bp_name_string not in name_list, "Didn't delete %s from the dummy target"%(self.bp_name_string))
-        # Also make sure the name got removed from breakpoints holding it:
-        self.assertFalse(bkpt.MatchesName(self.bp_name_string), "Didn't remove the name from the breakpoint.")
-
-    def check_permission_results(self, bp_name):
-        self.assertEqual(bp_name.GetAllowDelete(), False, "Didn't set allow delete.")
-        protected_bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        protected_id = protected_bkpt.GetID()
-
-        unprotected_bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        unprotected_id = unprotected_bkpt.GetID()
-
-        success = protected_bkpt.AddName(self.bp_name_string)
-        self.assertTrue(success, "Couldn't add this name to the breakpoint")
-
-        self.target.DisableAllBreakpoints()
-        self.assertEqual(protected_bkpt.IsEnabled(), True, "Didnt' keep breakpoint from being disabled")
-        self.assertEqual(unprotected_bkpt.IsEnabled(), False, "Protected too many breakpoints from disabling.")
-
-        # Try from the command line too:
-        unprotected_bkpt.SetEnabled(True)
-        result = lldb.SBCommandReturnObject()
-        self.dbg.GetCommandInterpreter().HandleCommand("break disable", result)
-        self.assertTrue(result.Succeeded())
-        self.assertEqual(protected_bkpt.IsEnabled(), True, "Didnt' keep breakpoint from being disabled")
-        self.assertEqual(unprotected_bkpt.IsEnabled(), False, "Protected too many breakpoints from disabling.")
-
-        self.target.DeleteAllBreakpoints()
-        bkpt = self.target.FindBreakpointByID(protected_id)
-        self.assertTrue(bkpt.IsValid(), "Didn't keep the breakpoint from being deleted.")
-        bkpt = self.target.FindBreakpointByID(unprotected_id)
-        self.assertFalse(bkpt.IsValid(), "Protected too many breakpoints from deletion.")
-
-        # Remake the unprotected breakpoint and try again from the command line:
-        unprotected_bkpt = self.target.BreakpointCreateByLocation(self.main_file_spec, 10)
-        unprotected_id = unprotected_bkpt.GetID()
-
-        self.dbg.GetCommandInterpreter().HandleCommand("break delete -f", result)
-        self.assertTrue(result.Succeeded())
-        bkpt = self.target.FindBreakpointByID(protected_id)
-        self.assertTrue(bkpt.IsValid(), "Didn't keep the breakpoint from being deleted.")
-        bkpt = self.target.FindBreakpointByID(unprotected_id)
-        self.assertFalse(bkpt.IsValid(), "Protected too many breakpoints from deletion.")
-
-    def do_check_configuring_permissions_sb(self):
-        bp_name = lldb.SBBreakpointName(self.target, self.bp_name_string)
-
-        # Make a breakpoint name with delete disallowed:
-        bp_name = lldb.SBBreakpointName(self.target, self.bp_name_string)
-        self.assertTrue(bp_name.IsValid(), "Failed to make breakpoint name for valid name.")
-
-        bp_name.SetAllowDelete(False)
-        bp_name.SetAllowDisable(False)
-        bp_name.SetAllowList(False)
-        self.check_permission_results(bp_name)
-
-    def do_check_configuring_permissions_cli(self):
-        # Make the name with the right options using the command line:
-        self.runCmd("breakpoint name configure -L 0 -D 0 -A 0 %s"%(self.bp_name_string), check=True)
-        # Now look up the breakpoint we made, and check that it works.
-        bp_name = lldb.SBBreakpointName(self.target, self.bp_name_string)
-        self.assertTrue(bp_name.IsValid(), "Didn't make a breakpoint name we could find.")
-        self.check_permission_results(bp_name)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/main.c
deleted file mode 100644
index b1ed4465c1d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_names/main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include <stdio.h>
-
-// This simple program is to demonstrate the capability of the lldb command
-// "breakpoint modify -i <count> breakpt-id" to set the number of times a
-// breakpoint is skipped before stopping.  Ignore count can also be set upon
-// breakpoint creation by 'breakpoint set ... -i <count>'.
-
-int a(int);
-int b(int);
-int c(int);
-
-int a(int val)
-{
-    if (val <= 1)
-        return b(val);
-    else if (val >= 3)
-        return c(val); // a(3) -> c(3) Find the call site of c(3).
-
-    return val;
-}
-
-int b(int val)
-{
-    return c(val);
-}
-
-int c(int val)
-{
-    return val + 3; // Find the line number of function "c" here.
-}
-
-int main (int argc, char const *argv[])
-{
-    int A1 = a(1);  // a(1) -> b(1) -> c(1)
-    printf("a(1) returns %d\n", A1);
-    
-    int B2 = b(2);  // b(2) -> c(2) Find the call site of b(2).
-    printf("b(2) returns %d\n", B2);
-    
-    int A3 = a(3);  // a(3) -> c(3) Find the call site of a(3).
-    printf("a(3) returns %d\n", A3);
-    
-    int C1 = c(5); // Find the call site of c in main.
-    printf ("c(5) returns %d\n", C1);
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile
deleted file mode 100644
index 457c4972f2d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp foo.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
deleted file mode 100644
index 66ec1161d77..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ /dev/null
@@ -1,114 +0,0 @@
-"""
-Test breakpoint command for different options.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class BreakpointOptionsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test(self):
-        """Test breakpoint command for different options."""
-        self.build()
-        self.breakpoint_options_test()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line = line_number('main.cpp', '// Set break point at this line.')
-
-    def breakpoint_options_test(self):
-        """Test breakpoint command for different options."""
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # This should create a breakpoint with 1 locations.
-        lldbutil.run_break_set_by_file_and_line(
-            self,
-            "main.cpp",
-            self.line,
-            extra_options="-K 1",
-            num_expected_locations=1)
-        lldbutil.run_break_set_by_file_and_line(
-            self,
-            "main.cpp",
-            self.line,
-            extra_options="-K 0",
-            num_expected_locations=1)
-
-        # Run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # Stopped once.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 2."])
-
-        # Check the list of breakpoint.
-        self.expect(
-            "breakpoint list -f",
-            "Breakpoint locations shown correctly",
-            substrs=[
-                "1: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" %
-                self.line,
-                "2: file = 'main.cpp', line = %d, exact_match = 0, locations = 1" %
-                self.line])
-
-        # Continue the program, there should be another stop.
-        self.runCmd("process continue")
-
-        # Stopped again.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 1."])
-
-        # Continue the program, we should exit.
-        self.runCmd("process continue")
-
-        # We should exit.
-        self.expect("process status", "Process exited successfully",
-                    patterns=["^Process [0-9]+ exited with status = 0"])
-
-    def breakpoint_options_language_test(self):
-        """Test breakpoint command for language option."""
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # This should create a breakpoint with 1 locations.
-        lldbutil.run_break_set_by_symbol(
-            self,
-            'ns::func',
-            sym_exact=False,
-            extra_options="-L c++",
-            num_expected_locations=1)
-
-        # This should create a breakpoint with 0 locations.
-        lldbutil.run_break_set_by_symbol(
-            self,
-            'ns::func',
-            sym_exact=False,
-            extra_options="-L c",
-            num_expected_locations=0)
-        self.runCmd("settings set target.language c")
-        lldbutil.run_break_set_by_symbol(
-            self, 'ns::func', sym_exact=False, num_expected_locations=0)
-
-        # Run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # Stopped once.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 1."])
-
-        # Continue the program, we should exit.
-        self.runCmd("process continue")
-
-        # We should exit.
-        self.expect("process status", "Process exited successfully",
-                    patterns=["^Process [0-9]+ exited with status = 0"])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp
deleted file mode 100644
index e5d0e09803e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-namespace ns {
-    int func(void)
-    {
-        return 0;
-    }
-}
-
-extern "C" int foo(void)
-{
-    return ns::func();
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp
deleted file mode 100644
index b2e8f523c84..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-extern "C" int foo(void);
-int main (int argc, char **argv) { // Set break point at this line.
-  return foo();
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
deleted file mode 100644
index 40a20a04b76..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/TestBreakpointSetRestart.py
+++ /dev/null
@@ -1,50 +0,0 @@
-"""
-Test inferior restart when breakpoint is set on running target.
-"""
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-
-
-class BreakpointSetRestart(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    BREAKPOINT_TEXT = 'Set a breakpoint here'
-
-    @skipIfNetBSD
-    def test_breakpoint_set_restart(self):
-        self.build()
-
-        exe = self.getBuildArtifact("a.out")
-
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        self.dbg.SetAsync(True)
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        event = lldb.SBEvent()
-        # Wait for inferior to transition to running state
-        while self.dbg.GetListener().WaitForEvent(2, event):
-            if lldb.SBProcess.GetStateFromEvent(event) == lldb.eStateRunning:
-                break
-
-        bp = target.BreakpointCreateBySourceRegex(
-            self.BREAKPOINT_TEXT, lldb.SBFileSpec('main.cpp'))
-        self.assertTrue(
-            bp.IsValid() and bp.GetNumLocations() == 1,
-            VALID_BREAKPOINT)
-
-        while self.dbg.GetListener().WaitForEvent(2, event):
-            if lldb.SBProcess.GetStateFromEvent(
-                    event) == lldb.eStateStopped and lldb.SBProcess.GetRestartedFromEvent(event):
-                continue
-            if lldb.SBProcess.GetStateFromEvent(event) == lldb.eStateRunning:
-                continue
-            self.fail(
-                "Setting a breakpoint generated an unexpected event: %s" %
-                lldb.SBDebugger.StateAsCString(
-                    lldb.SBProcess.GetStateFromEvent(event)))
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/main.cpp
deleted file mode 100644
index 46682ec264d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_set_restart/main.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <chrono>
-#include <stdio.h>
-#include <thread>
-
-
-int main(int argc, char const *argv[])
-{
-    static bool done = false;
-    while (!done)
-    {
-      std::this_thread::sleep_for(std::chrono::milliseconds{100});
-    }
-    printf("Set a breakpoint here.\n");
-    return 0;
-}
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
deleted file mode 100644
index 2d7f20f43fe..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := relative.cpp
-
-EXE := CompDirSymLink
-
-include $(LEVEL)/Makefile.rules
-
-# Force relative filenames by copying it into the build directory.
-relative.cpp: main.cpp
-	cp -f $< $@
-
-clean::
-	rm -rf relative.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
deleted file mode 100644
index 5b2c35fe5f7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
+++ /dev/null
@@ -1,79 +0,0 @@
-"""
-Test breakpoint command with AT_comp_dir set to symbolic link.
-"""
-from __future__ import print_function
-
-
-import os
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-_EXE_NAME = 'CompDirSymLink'  # Must match Makefile
-_SRC_FILE = 'relative.cpp'
-_COMP_DIR_SYM_LINK_PROP = 'plugin.symbol-file.dwarf.comp-dir-symlink-paths'
-
-
-class CompDirSymLinkTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line = line_number(
-            os.path.join(self.getSourceDir(), "main.cpp"),
-            '// Set break point at this line.')
-
-    @skipIf(hostoslist=["windows"])
-    def test_symlink_paths_set(self):
-        pwd_symlink = self.create_src_symlink()
-        self.doBuild(pwd_symlink)
-        self.runCmd(
-            "settings set %s %s" %
-            (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
-        src_path = self.getBuildArtifact(_SRC_FILE)
-        lldbutil.run_break_set_by_file_and_line(self, src_path, self.line)
-
-    @skipIf(hostoslist=no_match(["linux"]))
-    def test_symlink_paths_set_procselfcwd(self):
-        os.chdir(self.getBuildDir())
-        pwd_symlink = '/proc/self/cwd'
-        self.doBuild(pwd_symlink)
-        self.runCmd(
-            "settings set %s %s" %
-            (_COMP_DIR_SYM_LINK_PROP, pwd_symlink))
-        src_path = self.getBuildArtifact(_SRC_FILE)
-        # /proc/self/cwd points to a realpath form of current directory.
-        src_path = os.path.realpath(src_path)
-        lldbutil.run_break_set_by_file_and_line(self, src_path, self.line)
-
-    @skipIf(hostoslist=["windows"])
-    def test_symlink_paths_unset(self):
-        pwd_symlink = self.create_src_symlink()
-        self.doBuild(pwd_symlink)
-        self.runCmd('settings clear ' + _COMP_DIR_SYM_LINK_PROP)
-        src_path = self.getBuildArtifact(_SRC_FILE)
-        self.assertRaises(
-            AssertionError,
-            lldbutil.run_break_set_by_file_and_line,
-            self,
-            src_path,
-            self.line)
-
-    def create_src_symlink(self):
-        pwd_symlink = self.getBuildArtifact('pwd_symlink')
-        if os.path.exists(pwd_symlink):
-            os.unlink(pwd_symlink)
-        os.symlink(self.getBuildDir(), pwd_symlink)
-        self.addTearDownHook(lambda: os.remove(pwd_symlink))
-        return pwd_symlink
-
-    def doBuild(self, pwd_symlink):
-        self.build(None, None, {'PWD': pwd_symlink})
-
-        exe = self.getBuildArtifact(_EXE_NAME)
-        self.runCmd('file ' + exe, CURRENT_EXECUTABLE_SET)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp
deleted file mode 100644
index 13e5e3e891f..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-int main (int argc, char const *argv[])
-{
-    return 0; // Set break point at this line.
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile
deleted file mode 100644
index f89b52a972e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
deleted file mode 100644
index 6afde150d8d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/TestConsecutiveBreakpoints.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-Test that we handle breakpoints on consecutive instructions correctly.
-"""
-
-from __future__ import print_function
-
-
-import unittest2
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class ConsecutiveBreakpointsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def prepare_test(self):
-        self.build()
-
-        (self.target, self.process, self.thread, bkpt) = lldbutil.run_to_source_breakpoint(
-                self, "Set breakpoint here", lldb.SBFileSpec("main.cpp"))
-
-        # Set breakpoint to the next instruction
-        frame = self.thread.GetFrameAtIndex(0)
-
-        address = frame.GetPCAddress()
-        instructions = self.target.ReadInstructions(address, 2)
-        self.assertTrue(len(instructions) == 2)
-        self.bkpt_address = instructions[1].GetAddress()
-        self.breakpoint2 = self.target.BreakpointCreateByAddress(
-            self.bkpt_address.GetLoadAddress(self.target))
-        self.assertTrue(
-            self.breakpoint2 and self.breakpoint2.GetNumLocations() == 1,
-            VALID_BREAKPOINT)
-
-    def finish_test(self):
-        # Run the process until termination
-        self.process.Continue()
-        self.assertEquals(self.process.GetState(), lldb.eStateExited)
-
-    @no_debug_info_test
-    def test_continue(self):
-        """Test that continue stops at the second breakpoint."""
-        self.prepare_test()
-
-        self.process.Continue()
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        # We should be stopped at the second breakpoint
-        self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(
-            self.process, self.breakpoint2)
-        self.assertIsNotNone(
-            self.thread,
-            "Expected one thread to be stopped at breakpoint 2")
-
-        self.finish_test()
-
-    @no_debug_info_test
-    def test_single_step(self):
-        """Test that single step stops at the second breakpoint."""
-        self.prepare_test()
-
-        step_over = False
-        self.thread.StepInstruction(step_over)
-
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        self.assertEquals(
-            self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(
-                self.target), self.bkpt_address.GetLoadAddress(
-                self.target))
-        self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(
-            self.process, self.breakpoint2)
-        self.assertIsNotNone(
-            self.thread,
-            "Expected one thread to be stopped at breakpoint 2")
-
-        self.finish_test()
-
-    @no_debug_info_test
-    def test_single_step_thread_specific(self):
-        """Test that single step stops, even though the second breakpoint is not valid."""
-        self.prepare_test()
-
-        # Choose a thread other than the current one. A non-existing thread is
-        # fine.
-        thread_index = self.process.GetNumThreads() + 1
-        self.assertFalse(self.process.GetThreadAtIndex(thread_index).IsValid())
-        self.breakpoint2.SetThreadIndex(thread_index)
-
-        step_over = False
-        self.thread.StepInstruction(step_over)
-
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        self.assertEquals(
-            self.thread.GetFrameAtIndex(0).GetPCAddress().GetLoadAddress(
-                self.target), self.bkpt_address.GetLoadAddress(
-                self.target))
-        self.assertEquals(
-            self.thread.GetStopReason(),
-            lldb.eStopReasonPlanComplete,
-            "Stop reason should be 'plan complete'")
-
-        self.finish_test()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/main.cpp
deleted file mode 100644
index 94d0a0415d7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoints/main.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-int
-main(int argc, char const *argv[])
-{
-    int a = 0;
-    int b = 1;
-    a = b + 1; // Set breakpoint here
-    b = a + 1;
-    return 0;
-}
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
deleted file mode 100644
index f89b52a972e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
deleted file mode 100644
index be21c6eea13..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""
-Test lldb breakpoint ids.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestCPPBreakpointLocations(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
-    def test(self):
-        self.build()
-        self.breakpoint_id_tests()
-
-    def verify_breakpoint_locations(self, target, bp_dict):
-
-        name = bp_dict['name']
-        names = bp_dict['loc_names']
-        bp = target.BreakpointCreateByName(name)
-        self.assertEquals(
-            bp.GetNumLocations(),
-            len(names),
-            "Make sure we find the right number of breakpoint locations")
-
-        bp_loc_names = list()
-        for bp_loc in bp:
-            bp_loc_names.append(bp_loc.GetAddress().GetFunction().GetName())
-
-        for name in names:
-            found = name in bp_loc_names
-            if not found:
-                print("Didn't find '%s' in: %s" % (name, bp_loc_names))
-            self.assertTrue(found, "Make sure we find all required locations")
-
-    def breakpoint_id_tests(self):
-
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-        bp_dicts = [
-            {'name': 'func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
-            {'name': 'func2', 'loc_names': ['a::c::func2()', 'c::d::func2()']},
-            {'name': 'func3', 'loc_names': ['a::c::func3()', 'b::c::func3()', 'c::d::func3()']},
-            {'name': 'c::func1', 'loc_names': ['a::c::func1()', 'b::c::func1()']},
-            {'name': 'c::func2', 'loc_names': ['a::c::func2()']},
-            {'name': 'c::func3', 'loc_names': ['a::c::func3()', 'b::c::func3()']},
-            {'name': 'a::c::func1', 'loc_names': ['a::c::func1()']},
-            {'name': 'b::c::func1', 'loc_names': ['b::c::func1()']},
-            {'name': 'c::d::func2', 'loc_names': ['c::d::func2()']},
-            {'name': 'a::c::func1()', 'loc_names': ['a::c::func1()']},
-            {'name': 'b::c::func1()', 'loc_names': ['b::c::func1()']},
-            {'name': 'c::d::func2()', 'loc_names': ['c::d::func2()']},
-        ]
-
-        for bp_dict in bp_dicts:
-            self.verify_breakpoint_locations(target, bp_dict)
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
-    def test_destructors(self):
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-
-        # Don't skip prologue, so we can check the breakpoint address more
-        # easily
-        self.runCmd("settings set target.skip-prologue false")
-        try:
-            names = ['~c', 'c::~c', 'c::~c()']
-            loc_names = {'a::c::~c()', 'b::c::~c()'}
-            # TODO: For windows targets we should put windows mangled names
-            # here
-            symbols = [
-                '_ZN1a1cD1Ev',
-                '_ZN1a1cD2Ev',
-                '_ZN1b1cD1Ev',
-                '_ZN1b1cD2Ev']
-
-            for name in names:
-                bp = target.BreakpointCreateByName(name)
-
-                bp_loc_names = {bp_loc.GetAddress().GetFunction().GetName()
-                                for bp_loc in bp}
-                self.assertEquals(
-                    bp_loc_names,
-                    loc_names,
-                    "Breakpoint set on the correct symbol")
-
-                bp_addresses = {bp_loc.GetLoadAddress() for bp_loc in bp}
-                symbol_addresses = set()
-                for symbol in symbols:
-                    sc_list = target.FindSymbols(symbol, lldb.eSymbolTypeCode)
-                    self.assertEquals(
-                        sc_list.GetSize(), 1, "Found symbol " + symbol)
-                    symbol = sc_list.GetContextAtIndex(0).GetSymbol()
-                    symbol_addresses.add(
-                        symbol.GetStartAddress().GetLoadAddress(target))
-
-                self.assertEquals(
-                    symbol_addresses,
-                    bp_addresses,
-                    "Breakpoint set on correct address")
-        finally:
-            self.runCmd("settings clear target.skip-prologue")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
deleted file mode 100644
index 4afabcbd36e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include <stdio.h>
-#include <stdint.h>
-
-namespace a {
-    class c {
-    public:
-        c();
-        ~c();
-        void func1() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-        void func2() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-        void func3() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-    };
-
-    c::c() {}
-    c::~c() {}
-}
-
-namespace b {
-    class c {
-    public:
-        c();
-        ~c();
-        void func1() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-        void func3() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-    };
-
-    c::c() {}
-    c::~c() {}
-}
-
-namespace c {
-    class d {
-    public:
-        d () {}
-        ~d() {}
-        void func2() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-        void func3() 
-        {
-            puts (__PRETTY_FUNCTION__);
-        }
-    };
-}
-
-int main (int argc, char const *argv[])
-{
-    a::c ac;
-    b::c bc;
-    c::d cd;
-    ac.func1();
-    ac.func2();
-    ac.func3();
-    bc.func1();
-    bc.func3();
-    cd.func2();
-    cd.func3();
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
deleted file mode 100644
index e8a1b81a839..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
-Test that you can set breakpoint and hit the C++ language exception breakpoint
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestCPPExceptionBreakpoint (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    my_var = 10
-
-    @add_test_categories(['pyapi'])
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24538")
-    @expectedFailureNetBSD
-    def test_cpp_exception_breakpoint(self):
-        """Test setting and hitting the C++ exception breakpoint."""
-        self.build()
-        self.do_cpp_exception_bkpt()
-
-    def setUp(self):
-        TestBase.setUp(self)
-        self.main_source = "main.c"
-        self.main_source_spec = lldb.SBFileSpec(self.main_source)
-
-    def do_cpp_exception_bkpt(self):
-        exe = self.getBuildArtifact("a.out")
-        error = lldb.SBError()
-
-        self.target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.target, VALID_TARGET)
-
-        exception_bkpt = self.target.BreakpointCreateForException(
-            lldb.eLanguageTypeC_plus_plus, False, True)
-        self.assertTrue(
-            exception_bkpt.IsValid(),
-            "Created exception breakpoint.")
-
-        process = self.target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertTrue(process, PROCESS_IS_VALID)
-
-        thread_list = lldbutil.get_threads_stopped_at_breakpoint(
-            process, exception_bkpt)
-        self.assertTrue(len(thread_list) == 1,
-                        "One thread stopped at the exception breakpoint.")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp
deleted file mode 100644
index 76cb22735a7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <exception>
-
-void
-throws_int ()
-{
-    throw 5;
-}
-
-int
-main ()
-{
-    throws_int();
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py
deleted file mode 100644
index f8d5704d990..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/TestDebugBreak.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""
-Test embedded breakpoints, like `asm int 3;` in x86 or or `__debugbreak` on Windows.
-"""
-
-from __future__ import print_function
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class DebugBreakTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipIf(archs=no_match(["i386", "i686", "x86_64"]))
-    @no_debug_info_test
-    def test_asm_int_3(self):
-        """Test that intrinsics like `__debugbreak();` and `asm {"int3"}` are treated like breakpoints."""
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-
-        # Run the program.
-        target = self.dbg.CreateTarget(exe)
-        process = target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-
-        # We've hit the first stop, so grab the frame.
-        self.assertEqual(process.GetState(), lldb.eStateStopped)
-        stop_reason = lldb.eStopReasonException if (lldbplatformutil.getPlatform(
-        ) == "windows" or lldbplatformutil.getPlatform() == "macosx") else lldb.eStopReasonSignal
-        thread = lldbutil.get_stopped_thread(process, stop_reason)
-        self.assertIsNotNone(
-            thread, "Unable to find thread stopped at the __debugbreak()")
-        frame = thread.GetFrameAtIndex(0)
-
-        # We should be in funciton 'bar'.
-        self.assertTrue(frame.IsValid())
-        function_name = frame.GetFunctionName()
-        self.assertTrue('bar' in function_name,
-                        "Unexpected function name {}".format(function_name))
-
-        # We should be able to evaluate the parameter foo.
-        value = frame.EvaluateExpression('*foo')
-        self.assertEqual(value.GetValueAsSigned(), 42)
-
-        # The counter should be 1 at the first stop and increase by 2 for each
-        # subsequent stop.
-        counter = 1
-        while counter < 20:
-            value = frame.EvaluateExpression('count')
-            self.assertEqual(value.GetValueAsSigned(), counter)
-            counter += 2
-            process.Continue()
-
-        # The inferior should exit after the last iteration.
-        self.assertEqual(process.GetState(), lldb.eStateExited)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/main.c
deleted file mode 100644
index 5f936327e4e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/debugbreak/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifdef _MSC_VER
-#include <intrin.h>
-#define BREAKPOINT_INTRINSIC()    __debugbreak()
-#else
-#define BREAKPOINT_INTRINSIC()    __asm__ __volatile__ ("int3")
-#endif
-
-int
-bar(int const *foo)
-{
-    int count = 0, i = 0;
-    for (; i < 10; ++i)
-    {
-        count += 1;
-        BREAKPOINT_INTRINSIC();
-        count += 1;
-    }
-    return *foo;
-}
-
-int
-main(int argc, char **argv)
-{
-    int foo = 42;
-    bar(&foo);
-    return 0;
-}
-
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
deleted file mode 100644
index 7934cd5db42..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
deleted file mode 100644
index f1c8abab167..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ /dev/null
@@ -1,72 +0,0 @@
-"""
-Test breakpoint commands set before we have a target
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class BreakpointInDummyTarget (TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test(self):
-        """Test breakpoint set before we have a target. """
-        self.build()
-        self.dummy_breakpoint_test()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line = line_number('main.c', 'Set a breakpoint on this line.')
-        self.line2 = line_number('main.c', 'Set another on this line.')
-
-    def dummy_breakpoint_test(self):
-        """Test breakpoint set before we have a target. """
-
-        # This should create a breakpoint with 3 locations.
-        lldbutil.run_break_set_by_file_and_line(
-            self, "main.c", self.line, num_expected_locations=0)
-        lldbutil.run_break_set_by_file_and_line(
-            self, "main.c", self.line2, num_expected_locations=0)
-
-        # This is the function to remove breakpoints from the dummy target
-        # to get a clean slate for the next test case.
-        def cleanup():
-            self.runCmd('breakpoint delete -D -f', check=False)
-            self.runCmd('breakpoint list', check=False)
-
-        # Execute the cleanup function during test case tear down.
-        self.addTearDownHook(cleanup)
-
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # The breakpoint list should show 3 locations.
-        self.expect(
-            "breakpoint list -f",
-            "Breakpoint locations shown correctly",
-            substrs=[
-                "1: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
-                self.line,
-                "2: file = 'main.c', line = %d, exact_match = 0, locations = 1" %
-                self.line2])
-
-        # Run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # Stopped once.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 1."])
-
-        # Continue the program, there should be another stop.
-        self.runCmd("process continue")
-
-        # Stopped again.
-        self.expect("thread backtrace", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=["stop reason = breakpoint 2."])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c
deleted file mode 100644
index e1f03237cd1..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <stdio.h>
-
-int
-main (int argc, char **argv)
-{
-  printf ("Set a breakpoint on this line.\n"); 
-  
-  return 0; // Set another on this line.
-}
-
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/Makefile
deleted file mode 100644
index 06ef85cf908..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-LEVEL = ../../../make
-
-DYLIB_NAME := foo
-DYLIB_CXX_SOURCES := foo.cpp
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
deleted file mode 100644
index 9ca44a95ad2..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/TestBreakpointInGlobalConstructor.py
+++ /dev/null
@@ -1,47 +0,0 @@
-"""
-Test that we can hit breakpoints in global constructors
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestBreakpointInGlobalConstructors(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    NO_DEBUG_INFO_TESTCASE = True
-
-    @expectedFailureNetBSD
-    def test(self):
-        self.build()
-        self.line_foo = line_number('foo.cpp', '// !BR_foo')
-        self.line_main = line_number('main.cpp', '// !BR_main')
-
-        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
-        self.assertTrue(target, VALID_TARGET)
-
-        env= self.registerSharedLibrariesWithTarget(target, ["foo"])
-
-        bp_main = lldbutil.run_break_set_by_file_and_line(
-            self, 'main.cpp', self.line_main)
-
-        bp_foo = lldbutil.run_break_set_by_file_and_line(
-            self, 'foo.cpp', self.line_foo, num_expected_locations=-2)
-
-        process = target.LaunchSimple(
-            None, env, self.get_process_working_directory())
-
-        self.assertIsNotNone(
-            lldbutil.get_one_thread_stopped_at_breakpoint_id(
-                self.process(), bp_foo))
-
-        self.runCmd("continue")
-
-        self.assertIsNotNone(
-            lldbutil.get_one_thread_stopped_at_breakpoint_id(
-                self.process(), bp_main))
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.cpp
deleted file mode 100644
index f959a295467..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "foo.h"
-
-Foo::Foo() : x(42) {
-    bool some_code = x == 42;  // !BR_foo
-} 
-
-Foo FooObj;
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.h b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.h
deleted file mode 100644
index 3bc63fed755..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/foo.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef FOO_H
-#define FOO_H
-
-struct LLDB_TEST_API Foo {
-  Foo();
-  int x;
-};
-
-extern LLDB_TEST_API Foo FooObj;
-
-#endif
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/main.cpp
deleted file mode 100644
index d1c8038dfad..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/global_constructor/main.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "foo.h"
-
-struct Main {
-  Main();
-  int x;
-};
-
-Main::Main() : x(47) {
-    bool some_code = x == 47; // !BR_main
-}
-
-Main MainObj;
-
-int main() { return MainObj.x + FooObj.x; }
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile
deleted file mode 100644
index 3665ae323e7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../../make
-
-ENABLE_THREADS := YES
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
deleted file mode 100644
index 95c7966716c..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/TestHWBreakMultiThread.py
+++ /dev/null
@@ -1,105 +0,0 @@
-"""
-Test hardware breakpoints for multiple threads.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-# Hardware breakpoints are supported only by platforms mentioned in oslist.
-@skipUnlessPlatform(oslist=['linux'])
-class HardwareBreakpointMultiThreadTestCase(TestBase):
-    NO_DEBUG_INFO_TESTCASE = True
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    # LLDB supports hardware breakpoints for arm and aarch64 architectures.
-    @skipIf(archs=no_match(['arm', 'aarch64']))
-    def test_hw_break_set_delete_multi_thread(self):
-        self.build()
-        self.setTearDownCleanup()
-        self.break_multi_thread('delete')
-
-    # LLDB supports hardware breakpoints for arm and aarch64 architectures.
-    @skipIf(archs=no_match(['arm', 'aarch64']))
-    def test_hw_break_set_disable_multi_thread(self):
-        self.build()
-        self.setTearDownCleanup()
-        self.break_multi_thread('disable')
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Our simple source filename.
-        self.source = 'main.cpp'
-        # Find the line number to break inside main().
-        self.first_stop = line_number(
-            self.source, 'Starting thread creation with hardware breakpoint set')
-
-    def break_multi_thread(self, removal_type):
-        """Test that lldb hardware breakpoints work for multiple threads."""
-        self.runCmd("file " + self.getBuildArtifact("a.out"),
-                    CURRENT_EXECUTABLE_SET)
-
-        # Stop in main before creating any threads.
-        lldbutil.run_break_set_by_file_and_line(
-            self, None, self.first_stop, num_expected_locations=1)
-
-        # Run the program.
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # We should be stopped again due to the breakpoint.
-        # The stop reason of the thread should be breakpoint.
-        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=['stopped',
-                             'stop reason = breakpoint'])
-
-        # Now set a hardware breakpoint in thread function.
-        self.expect("breakpoint set -b hw_break_function --hardware",
-            substrs=[
-                'Breakpoint',
-                'hw_break_function',
-                'address = 0x'])
-
-        # We should stop in hw_break_function function for 4 threads.
-        count = 0
-
-        while count < 2 :
-
-            self.runCmd("process continue")
-
-            # We should be stopped in hw_break_function
-            # The stop reason of the thread should be breakpoint.
-            self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-                substrs=[
-                    'stop reason = breakpoint',
-                    'hw_break_function'])
-
-            # Continue the loop and test that we are stopped 4 times.
-            count += 1
-
-        if removal_type == 'delete':
-            self.runCmd("settings set auto-confirm true")
-
-            # Now 'breakpoint delete' should just work fine without confirmation
-            # prompt from the command interpreter.
-            self.expect("breakpoint delete",
-                        startstr="All breakpoints removed")
-
-            # Restore the original setting of auto-confirm.
-            self.runCmd("settings clear auto-confirm")
-
-        elif removal_type == 'disable':
-            self.expect("breakpoint disable",
-                        startstr="All breakpoints disabled.")
-
-        # Continue. Program should exit without stopping anywhere.
-        self.runCmd("process continue")
-
-        # Process should have stopped and exited with status = 0
-        self.expect("process status", PROCESS_STOPPED,
-                    patterns=['Process .* exited with status = 0'])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
deleted file mode 100644
index 94a12c6241d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/hardware_breakpoints/hardware_breakpoint_on_multiple_threads/main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-
-#include <chrono>
-#include <cstdio>
-#include <mutex>
-#include <random>
-#include <thread>
-
-#define NUM_OF_THREADS 4
-
-std::mutex hw_break_mutex;
-
-void
-hw_break_function (uint32_t thread_index) {
-  printf ("%s called by Thread #%u...\n", __FUNCTION__, thread_index);
-}
-
-
-void
-thread_func (uint32_t thread_index) {
-  printf ("%s (thread index = %u) starting...\n", __FUNCTION__, thread_index);
-
-  hw_break_mutex.lock();
-  
-  hw_break_function(thread_index); // Call hw_break_function
-
-  hw_break_mutex.unlock();
-}
-
-
-int main (int argc, char const *argv[])
-{
-  std::thread threads[NUM_OF_THREADS]; 
-
-  printf ("Starting thread creation with hardware breakpoint set...\n");
-
-  for (auto &thread : threads)
-    thread = std::thread{thread_func, std::distance(threads, &thread)};
-
-  for (auto &thread : threads)
-    thread.join();
-
-  return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile
deleted file mode 100644
index 5b73ae626f3..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := int.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
deleted file mode 100644
index 9f184fb0ff4..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ /dev/null
@@ -1,67 +0,0 @@
-"""
-Test that inlined breakpoints (breakpoint set on a file/line included from
-another source file) works correctly.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class InlinedBreakpointsTestCase(TestBase):
-    """Bug fixed: rdar://problem/8464339"""
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_with_run_command(self):
-        """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
-        self.build()
-        self.inlined_breakpoints()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside basic_type.cpp.
-        self.line = line_number(
-            'basic_type.cpp',
-            '// Set break point at this line.')
-
-    def inlined_breakpoints(self):
-        """Test 'b basic_types.cpp:176' does break (where int.cpp includes basic_type.cpp)."""
-        exe = self.getBuildArtifact("a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        # With the inline-breakpoint-strategy, our file+line breakpoint should
-        # not resolve to a location.
-        self.runCmd('settings set target.inline-breakpoint-strategy headers')
-
-        # Set a breakpoint and fail because it is in an inlined source
-        # implemenation file
-        lldbutil.run_break_set_by_file_and_line(
-            self, "basic_type.cpp", self.line, num_expected_locations=0)
-
-        # Now enable breakpoints in implementation files and see the breakpoint
-        # set succeed
-        self.runCmd('settings set target.inline-breakpoint-strategy always')
-        # And add hooks to restore the settings during tearDown().
-        self.addTearDownHook(lambda: self.runCmd(
-            "settings set target.inline-breakpoint-strategy always"))
-
-        lldbutil.run_break_set_by_file_and_line(
-            self,
-            "basic_type.cpp",
-            self.line,
-            num_expected_locations=1,
-            loc_exact=True)
-
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        # The stop reason of the thread should be breakpoint.
-        # And it should break at basic_type.cpp:176.
-        self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
-                    substrs=['stopped',
-                             'stop reason = breakpoint',
-                             'basic_type.cpp:%d' % self.line])
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
deleted file mode 100644
index 75d2c3690c8..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// This file must have the following defined before it is included:
-// T defined to the type to test (int, float, etc)
-// T_CSTR a C string representation of the type T ("int", "float")
-// T_VALUE_1 defined to a valid initializer value for TEST_TYPE (7 for int, 2.0 for float)
-// T_VALUE_2, T_VALUE_3, T_VALUE_4 defined to a valid initializer value for TEST_TYPE that is different from TEST_VALUE_1
-// T_PRINTF_FORMAT defined if T can be printed with printf
-//
-// An example for integers is below
-#if 0
-
-#define T int
-#define T_CSTR "int"
-#define T_VALUE_1 11001110
-#define T_VALUE_2 22002220
-#define T_VALUE_3 33003330
-#define T_VALUE_4 44044440
-#define T_PRINTF_FORMAT "%i"
-
-#include "basic_type.cpp"
-
-#endif
-
-#include <cstdint>
-#include <cstdio>
-
-class a_class 
-{
-public:
-    a_class (const T& a, const T& b) :
-        m_a (a),
-        m_b (b)
-    {
-    }
-
-    ~a_class ()
-    {
-    }
-
-    const T&
-    get_a()
-    {
-        return m_a;
-    } 
-
-    void
-    set_a (const T& a)
-    {
-        m_a = a;
-    }
-
-    const T&
-    get_b()
-    {
-        return m_b;
-    } 
-
-    void
-    set_b (const T& b)
-    {
-        m_b = b;
-    }
-
-protected:
-    T m_a;
-    T m_b;
-};
-
-typedef struct a_struct_tag {
-    T a;
-    T b;
-} a_struct_t;
-
-
-typedef union a_union_zero_tag {
-    T a;
-    double a_double;
-} a_union_zero_t;
-
-typedef struct a_union_nonzero_tag {
-  double a_double;
-  a_union_zero_t u;
-} a_union_nonzero_t;
-
-
-void Puts(char const *msg)
-{
-  std::puts(msg);
-}
-
-int 
-main (int argc, char const *argv[])
-{
-    T a = T_VALUE_1;
-    T* a_ptr = &a;
-    T& a_ref = a;
-    T a_array_bounded[2] = { T_VALUE_1, T_VALUE_2 };    
-    T a_array_unbounded[] = { T_VALUE_1, T_VALUE_2 };
-
-    a_class a_class_instance (T_VALUE_1, T_VALUE_2);
-    a_class *a_class_ptr = &a_class_instance;
-    a_class &a_class_ref = a_class_instance;
-
-    a_struct_t a_struct = { T_VALUE_1, T_VALUE_2 };
-    a_struct_t *a_struct_ptr = &a_struct;
-    a_struct_t &a_struct_ref = a_struct;
-
-    // Create a union with type T at offset zero
-    a_union_zero_t a_union_zero;
-    a_union_zero.a = T_VALUE_1;
-    a_union_zero_t *a_union_zero_ptr = &a_union_zero;
-    a_union_zero_t &a_union_zero_ref = a_union_zero;
-
-    // Create a union with type T at a non-zero offset
-    a_union_nonzero_t a_union_nonzero;
-    a_union_nonzero.u.a = T_VALUE_1;
-    a_union_nonzero_t *a_union_nonzero_ptr = &a_union_nonzero;
-    a_union_nonzero_t &a_union_nonzero_ref = a_union_nonzero;
-
-    a_struct_t a_struct_array_bounded[2]  = {{ T_VALUE_1, T_VALUE_2 }, { T_VALUE_3, T_VALUE_4 }};
-    a_struct_t a_struct_array_unbounded[] = {{ T_VALUE_1, T_VALUE_2 }, { T_VALUE_3, T_VALUE_4 }};
-    a_union_zero_t a_union_zero_array_bounded[2];
-    a_union_zero_array_bounded[0].a = T_VALUE_1;
-    a_union_zero_array_bounded[1].a = T_VALUE_2;
-    a_union_zero_t a_union_zero_array_unbounded[] = {{ T_VALUE_1 }, { T_VALUE_2 }};
-    
-#ifdef T_PRINTF_FORMAT
-    std::printf ("%s: a = '" T_PRINTF_FORMAT "'\n", T_CSTR, a);
-    std::printf ("%s*: %p => *a_ptr = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_ptr, *a_ptr);
-    std::printf ("%s&: @%p => a_ref = '" T_PRINTF_FORMAT "'\n", T_CSTR, &a_ref, a_ref);
-
-    std::printf ("%s[2]: a_array_bounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_bounded[0]);
-    std::printf ("%s[2]: a_array_bounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_bounded[1]);
-
-    std::printf ("%s[]: a_array_unbounded[0] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_unbounded[0]);
-    std::printf ("%s[]: a_array_unbounded[1] = '" T_PRINTF_FORMAT "'\n", T_CSTR, a_array_unbounded[1]);
-
-    std::printf ("(a_class) a_class_instance.m_a = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_a());
-    std::printf ("(a_class) a_class_instance.m_b = '" T_PRINTF_FORMAT "'\n", a_class_instance.get_b());
-    std::printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_a = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_a());
-    std::printf ("(a_class*) a_class_ptr = %p, a_class_ptr->m_b = '" T_PRINTF_FORMAT "'\n", a_class_ptr, a_class_ptr->get_b());
-    std::printf ("(a_class&) a_class_ref = %p, a_class_ref.m_a = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_a());
-    std::printf ("(a_class&) a_class_ref = %p, a_class_ref.m_b = '" T_PRINTF_FORMAT "'\n", &a_class_ref, a_class_ref.get_b());
-
-    std::printf ("(a_struct_t) a_struct.a = '" T_PRINTF_FORMAT "'\n", a_struct.a);
-    std::printf ("(a_struct_t) a_struct.b = '" T_PRINTF_FORMAT "'\n", a_struct.b);
-    std::printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->a = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->a);
-    std::printf ("(a_struct_t*) a_struct_ptr = %p, a_struct_ptr->b = '" T_PRINTF_FORMAT "'\n", a_struct_ptr, a_struct_ptr->b);
-    std::printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.a = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.a);
-    std::printf ("(a_struct_t&) a_struct_ref = %p, a_struct_ref.b = '" T_PRINTF_FORMAT "'\n", &a_struct_ref, a_struct_ref.b);
-    
-    std::printf ("(a_union_zero_t) a_union_zero.a = '" T_PRINTF_FORMAT "'\n", a_union_zero.a);
-    std::printf ("(a_union_zero_t*) a_union_zero_ptr = %p, a_union_zero_ptr->a = '" T_PRINTF_FORMAT "'\n", a_union_zero_ptr, a_union_zero_ptr->a);
-    std::printf ("(a_union_zero_t&) a_union_zero_ref = %p, a_union_zero_ref.a = '" T_PRINTF_FORMAT "'\n", &a_union_zero_ref, a_union_zero_ref.a);
-
-    std::printf ("(a_union_nonzero_t) a_union_nonzero.u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero.u.a);
-    std::printf ("(a_union_nonzero_t*) a_union_nonzero_ptr = %p, a_union_nonzero_ptr->u.a = '" T_PRINTF_FORMAT "'\n", a_union_nonzero_ptr, a_union_nonzero_ptr->u.a);
-    std::printf ("(a_union_nonzero_t&) a_union_nonzero_ref = %p, a_union_nonzero_ref.u.a = '" T_PRINTF_FORMAT "'\n", &a_union_nonzero_ref, a_union_nonzero_ref.u.a);
-
-    std::printf ("(a_struct_t[2]) a_struct_array_bounded[0].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].a);
-    std::printf ("(a_struct_t[2]) a_struct_array_bounded[0].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[0].b);
-    std::printf ("(a_struct_t[2]) a_struct_array_bounded[1].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].a);
-    std::printf ("(a_struct_t[2]) a_struct_array_bounded[1].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_bounded[1].b);
-
-    std::printf ("(a_struct_t[]) a_struct_array_unbounded[0].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].a);
-    std::printf ("(a_struct_t[]) a_struct_array_unbounded[0].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[0].b);
-    std::printf ("(a_struct_t[]) a_struct_array_unbounded[1].a = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].a);
-    std::printf ("(a_struct_t[]) a_struct_array_unbounded[1].b = '" T_PRINTF_FORMAT "'\n", a_struct_array_unbounded[1].b);
-
-    std::printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[0].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[0].a);
-    std::printf ("(a_union_zero_t[2]) a_union_zero_array_bounded[1].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_bounded[1].a);
-
-    std::printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[0].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[0].a);
-    std::printf ("(a_union_zero_t[]) a_union_zero_array_unbounded[1].a = '" T_PRINTF_FORMAT "'\n", a_union_zero_array_unbounded[1].a);
-
-#endif
-    Puts("About to exit, break here to check values..."); // Set break point at this line.
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
deleted file mode 100644
index 922398b1c6e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#define T int
-#define T_CSTR "int"
-#define T_VALUE_1 11001110
-#define T_VALUE_2 22002220
-#define T_VALUE_3 33003330
-#define T_VALUE_4 44004440
-#define T_PRINTF_FORMAT "%i"
-
-#include "basic_type.cpp"
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/Makefile
deleted file mode 100644
index 06ef85cf908..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-LEVEL = ../../../make
-
-DYLIB_NAME := foo
-DYLIB_CXX_SOURCES := foo.cpp
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/TestMoveNearest.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/TestMoveNearest.py
deleted file mode 100644
index b8281e9c85b..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/TestMoveNearest.py
+++ /dev/null
@@ -1,69 +0,0 @@
-from __future__ import print_function
-
-
-import unittest2
-import lldb
-from lldbsuite.test.lldbtest import *
-import lldbsuite.test.lldbutil as lldbutil
-
-
-class TestMoveNearest(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    NO_DEBUG_INFO_TESTCASE = True
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.line1 = line_number('foo.h', '// !BR1')
-        self.line2 = line_number('foo.h', '// !BR2')
-        self.line_between = line_number('main.cpp', "// BR_Between")
-        print("BR_Between found at", self.line_between)
-        self.line_main = line_number('main.cpp', '// !BR_main')
-
-    def test(self):
-        """Test target.move-to-nearest logic"""
-
-        self.build()
-        target = self.dbg.CreateTarget(self.getBuildArtifact("a.out"))
-        self.assertTrue(target, VALID_TARGET)
-
-        lldbutil.run_break_set_by_symbol(self, 'main', sym_exact=True)
-        environment = self.registerSharedLibrariesWithTarget(target, ["foo"])
-        process = target.LaunchSimple(None, environment, self.get_process_working_directory())
-        self.assertEquals(process.GetState(), lldb.eStateStopped)
-
-        # Regardless of the -m value the breakpoint should have exactly one
-        # location on the foo functions
-        self.runCmd("settings set target.move-to-nearest-code true")
-        lldbutil.run_break_set_by_file_and_line(self, 'foo.h', self.line1,
-                loc_exact=True, extra_options="-m 1")
-        lldbutil.run_break_set_by_file_and_line(self, 'foo.h', self.line2,
-                loc_exact=True, extra_options="-m 1")
-
-        self.runCmd("settings set target.move-to-nearest-code false")
-        lldbutil.run_break_set_by_file_and_line(self, 'foo.h', self.line1,
-                loc_exact=True, extra_options="-m 0")
-        lldbutil.run_break_set_by_file_and_line(self, 'foo.h', self.line2,
-                loc_exact=True, extra_options="-m 0")
-
-
-        # Make sure we set a breakpoint in main with -m 1 for various lines in
-        # the function declaration
-        # "int"
-        lldbutil.run_break_set_by_file_and_line(self, 'main.cpp',
-                self.line_main-1, extra_options="-m 1")
-        # "main()"
-        lldbutil.run_break_set_by_file_and_line(self, 'main.cpp',
-                self.line_main, extra_options="-m 1")
-        # "{"
-        lldbutil.run_break_set_by_file_and_line(self, 'main.cpp',
-                self.line_main+1, extra_options="-m 1")
-        # "return .."
-        lldbutil.run_break_set_by_file_and_line(self, 'main.cpp',
-                self.line_main+2, extra_options="-m 1")
-
-        # Make sure we don't put move the breakpoint if it is set between two functions:
-        lldbutil.run_break_set_by_file_and_line(self, 'main.cpp',
-                self.line_between, extra_options="-m 1", num_expected_locations=0)
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.cpp
deleted file mode 100644
index 8dad0a23f36..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "foo.h"
-
-int call_foo1() { return foo1(); }
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.h b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.h
deleted file mode 100644
index 9f0e56dd22e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/foo.h
+++ /dev/null
@@ -1,5 +0,0 @@
-inline int foo1() { return 1; } // !BR1
-
-inline int foo2() { return 2; } // !BR2
-
-LLDB_TEST_API extern int call_foo1();
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/main.cpp
deleted file mode 100644
index 76a22a5420f..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/move_nearest/main.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include "foo.h"
-
-int call_foo2() { return foo2(); }
-// BR_Between
-int
-main() // !BR_main
-{
-  return call_foo1() + call_foo2();
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
deleted file mode 100644
index ad3cb3fadcd..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-LEVEL = ../../../make
-
-OBJC_SOURCES := main.m
-
-include $(LEVEL)/Makefile.rules
-
-LDFLAGS += -framework Foundation
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
deleted file mode 100644
index c33bd800887..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ /dev/null
@@ -1,130 +0,0 @@
-"""
-Test that objective-c constant strings are generated correctly by the expression
-parser.
-"""
-
-from __future__ import print_function
-
-
-import shutil
-import subprocess
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-@skipUnlessDarwin
-class TestObjCBreakpoints(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_break(self):
-        """Test setting Objective-C specific breakpoints (DWARF in .o files)."""
-        self.build()
-        self.setTearDownCleanup()
-        self.check_objc_breakpoints(False)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-        # Find the line number to break inside main().
-        self.main_source = "main.m"
-        self.line = line_number(self.main_source, '// Set breakpoint here')
-
-    def check_category_breakpoints(self):
-        name_bp = self.target.BreakpointCreateByName("myCategoryFunction")
-        selector_bp = self.target.BreakpointCreateByName(
-            "myCategoryFunction",
-            lldb.eFunctionNameTypeSelector,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
-            'Make sure setting a breakpoint by name "myCategoryFunction" sets a breakpoint even though it is in a category')
-        for bp_loc in selector_bp:
-            function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(
-                " myCategoryFunction]" in function_name,
-                'Make sure all function names have " myCategoryFunction]" in their names')
-
-        category_bp = self.target.BreakpointCreateByName(
-            "-[MyClass(MyCategory) myCategoryFunction]")
-        stripped_bp = self.target.BreakpointCreateByName(
-            "-[MyClass myCategoryFunction]")
-        stripped2_bp = self.target.BreakpointCreateByName(
-            "[MyClass myCategoryFunction]")
-        self.assertTrue(
-            category_bp.GetNumLocations() == 1,
-            "Make sure we can set a breakpoint using a full objective C function name with the category included (-[MyClass(MyCategory) myCategoryFunction])")
-        self.assertTrue(
-            stripped_bp.GetNumLocations() == 1,
-            "Make sure we can set a breakpoint using a full objective C function name without the category included (-[MyClass myCategoryFunction])")
-        self.assertTrue(
-            stripped2_bp.GetNumLocations() == 1,
-            "Make sure we can set a breakpoint using a full objective C function name without the category included ([MyClass myCategoryFunction])")
-
-    def check_objc_breakpoints(self, have_dsym):
-        """Test constant string generation amd comparison by the expression parser."""
-
-        # Set debugger into synchronous mode
-        self.dbg.SetAsync(False)
-
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        self.target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.target, VALID_TARGET)
-
-        #----------------------------------------------------------------------
-        # Set breakpoints on all selectors whose name is "count". This should
-        # catch breakpoints that are both C functions _and_ anything whose
-        # selector is "count" because just looking at "count" we can't tell
-        # definitively if the name is a selector or a C function
-        #----------------------------------------------------------------------
-        name_bp = self.target.BreakpointCreateByName("count")
-        selector_bp = self.target.BreakpointCreateByName(
-            "count",
-            lldb.eFunctionNameTypeSelector,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            name_bp.GetNumLocations() >= selector_bp.GetNumLocations(),
-            'Make sure we get at least the same amount of breakpoints if not more when setting by name "count"')
-        self.assertTrue(
-            selector_bp.GetNumLocations() > 50,
-            'Make sure we find a lot of "count" selectors')  # There are 93 on the latest MacOSX
-        for bp_loc in selector_bp:
-            function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(
-                " count]" in function_name,
-                'Make sure all function names have " count]" in their names')
-
-        #----------------------------------------------------------------------
-        # Set breakpoints on all selectors whose name is "isEqual:". This should
-        # catch breakpoints that are only ObjC selectors because no C function
-        # can end with a :
-        #----------------------------------------------------------------------
-        name_bp = self.target.BreakpointCreateByName("isEqual:")
-        selector_bp = self.target.BreakpointCreateByName(
-            "isEqual:",
-            lldb.eFunctionNameTypeSelector,
-            lldb.SBFileSpecList(),
-            lldb.SBFileSpecList())
-        self.assertTrue(
-            name_bp.GetNumLocations() == selector_bp.GetNumLocations(),
-            'Make sure setting a breakpoint by name "isEqual:" only sets selector breakpoints')
-        for bp_loc in selector_bp:
-            function_name = bp_loc.GetAddress().GetSymbol().GetName()
-            self.assertTrue(
-                " isEqual:]" in function_name,
-                'Make sure all function names have " isEqual:]" in their names')
-
-        self.check_category_breakpoints()
-
-        if have_dsym:
-            shutil.rmtree(exe + ".dSYM")
-        self.assertTrue(subprocess.call(
-            ['/usr/bin/strip', '-Sx', exe]) == 0, 'stripping dylib succeeded')
-
-        # Check breakpoints again, this time using the symbol table only
-        self.check_category_breakpoints()
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m
deleted file mode 100644
index 53567491219..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m
+++ /dev/null
@@ -1,98 +0,0 @@
-#import <Foundation/Foundation.h>
-#include <unistd.h>
-
-@interface MyClass : NSObject
-@end
-
-@implementation MyClass : NSObject
-@end
-
-@implementation MyClass (MyCategory)
-
-
-- (void) myCategoryFunction {
-    NSLog (@"myCategoryFunction");
-}
-
-@end
-
-
-    
-int
-Test_Selector ()
-{
-    SEL sel = @selector(length);
-    printf("sel = %p\n", sel);
-    // Expressions to test here for selector: 
-    // expression (char *)sel_getName(sel)
-    //      The expression above should return "sel" as it should be just
-    //      a uniqued C string pointer. We were seeing the result pointer being
-    //      truncated with recent LLDBs.
-    return 0; // Break here for selector: tests
-}
-
-int
-Test_NSString (const char *program)
-{
-    NSString *str = [NSString stringWithFormat:@"Hello from '%s'", program];
-    NSLog(@"NSString instance: %@", str);
-    printf("str = '%s'\n", [str cStringUsingEncoding: [NSString defaultCStringEncoding]]);
-    printf("[str length] = %zu\n", (size_t)[str length]);
-    printf("[str description] = %s\n", [[str description] UTF8String]);
-    id str_id = str;
-    // Expressions to test here for NSString:
-    // expression (char *)sel_getName(sel)
-    // expression [str length]
-    // expression [str_id length]
-    // expression [str description]
-    // expression [str_id description]
-    // expression str.length
-    // expression str.description
-    // expression str = @"new"
-    // expression str = [NSString stringWithFormat: @"%cew", 'N']
-    return 0; // Break here for NSString tests
-}
-
-NSString *my_global_str = NULL;
-
-int
-Test_NSArray ()
-{
-    NSMutableArray *nil_mutable_array = nil;
-    NSArray *array1 = [NSArray arrayWithObjects: @"array1 object1", @"array1 object2", @"array1 object3", nil];
-    NSArray *array2 = [NSArray arrayWithObjects: array1, @"array2 object2", @"array2 object3", nil];
-    // Expressions to test here for NSArray:
-    // expression [nil_mutable_array count]
-    // expression [array1 count]
-    // expression array1.count
-    // expression [array2 count]
-    // expression array2.count
-    id obj;
-    // After each object at index call, use expression and validate object
-    obj = [array1 objectAtIndex: 0]; // Break here for NSArray tests
-    obj = [array1 objectAtIndex: 1];
-    obj = [array1 objectAtIndex: 2];
-
-    obj = [array2 objectAtIndex: 0];
-    obj = [array2 objectAtIndex: 1];
-    obj = [array2 objectAtIndex: 2];
-    NSUInteger count = [nil_mutable_array count];
-    return 0;
-}
-
-
-int main (int argc, char const *argv[])
-{
-    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    Test_Selector(); // Set breakpoint here
-    Test_NSArray ();
-    Test_NSString (argv[0]);
-    MyClass *my_class = [[MyClass alloc] init];
-    [my_class myCategoryFunction];
-    printf("sizeof(id) = %zu\n", sizeof(id));
-    printf("sizeof(Class) = %zu\n", sizeof(Class));
-    printf("sizeof(SEL) = %zu\n", sizeof(SEL));
-
-    [pool release];
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile
deleted file mode 100644
index 7934cd5db42..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-ifneq (,$(findstring icc,$(CC)))
-    CFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py
deleted file mode 100644
index 020974ee469..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/TestRequireHWBreakpoints.py
+++ /dev/null
@@ -1,103 +0,0 @@
-"""
-Test require hardware breakpoints.
-"""
-
-from __future__ import print_function
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointLocationsTestCase(TestBase):
-    NO_DEBUG_INFO_TESTCASE = True
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_breakpoint(self):
-        """Test regular breakpoints when hardware breakpoints are required."""
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-
-        self.runCmd("settings set target.require-hardware-breakpoint true")
-
-        breakpoint = target.BreakpointCreateByLocation("main.c", 1)
-        self.assertTrue(breakpoint.IsHardware())
-
-    @skipIfWindows
-    def test_step_range(self):
-        """Test stepping when hardware breakpoints are required."""
-        self.build()
-
-        _, _, thread, _ = lldbutil.run_to_line_breakpoint(
-            self, lldb.SBFileSpec("main.c"), 1)
-
-        self.runCmd("settings set target.require-hardware-breakpoint true")
-
-        # Ensure we fail in the interpreter.
-        self.expect("thread step-in")
-        self.expect("thread step-in", error=True)
-
-        # Ensure we fail when stepping through the API.
-        error = lldb.SBError()
-        thread.StepInto('', 4, error)
-        self.assertTrue(error.Fail())
-        self.assertTrue("Could not create hardware breakpoint for thread plan"
-                        in error.GetCString())
-
-    @skipIfWindows
-    def test_step_out(self):
-        """Test stepping out when hardware breakpoints are required."""
-        self.build()
-
-        _, _, thread, _ = lldbutil.run_to_line_breakpoint(
-            self, lldb.SBFileSpec("main.c"), 1)
-
-        self.runCmd("settings set target.require-hardware-breakpoint true")
-
-        # Ensure this fails in the command interpreter.
-        self.expect("thread step-out", error=True)
-
-        # Ensure we fail when stepping through the API.
-        error = lldb.SBError()
-        thread.StepOut(error)
-        self.assertTrue(error.Fail())
-        self.assertTrue("Could not create hardware breakpoint for thread plan"
-                        in error.GetCString())
-
-    @skipIfWindows
-    def test_step_over(self):
-        """Test stepping over when hardware breakpoints are required."""
-        self.build()
-
-        _, _, thread, _ = lldbutil.run_to_line_breakpoint(
-            self, lldb.SBFileSpec("main.c"), 7)
-
-        self.runCmd("settings set target.require-hardware-breakpoint true")
-
-        # Step over doesn't fail immediately but fails later on.
-        self.expect(
-            "thread step-over",
-            error=True,
-            substrs=[
-                'error: Could not create hardware breakpoint for thread plan.'
-            ])
-
-    @skipIfWindows
-    def test_step_until(self):
-        """Test stepping until when hardware breakpoints are required."""
-        self.build()
-
-        _, _, thread, _ = lldbutil.run_to_line_breakpoint(
-            self, lldb.SBFileSpec("main.c"), 7)
-
-        self.runCmd("settings set target.require-hardware-breakpoint true")
-
-        self.expect("thread until 5", error=True)
-
-        # Ensure we fail when stepping through the API.
-        error = thread.StepOverUntil(lldb.SBFrame(), lldb.SBFileSpec(), 5)
-        self.assertTrue(error.Fail())
-        self.assertTrue("Could not create hardware breakpoint for thread plan"
-                        in error.GetCString())
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/main.c
deleted file mode 100644
index 7d49a57d4c7..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/require_hw_breakpoints/main.c
+++ /dev/null
@@ -1,9 +0,0 @@
-int break_on_me() {
-  int i = 10;
-  i++;
-  return i;
-}
-
-int main() {
-  return break_on_me();
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile
deleted file mode 100644
index 6067ee45e98..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-CFLAGS_EXTRAS += -std=c99
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
deleted file mode 100644
index 59abad6110e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/TestScriptedResolver.py
+++ /dev/null
@@ -1,197 +0,0 @@
-"""
-Test setting breakpoints using a scripted resolver
-"""
-
-from __future__ import print_function
-
-
-import os
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-
-
-class TestScriptedResolver(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    NO_DEBUG_INFO_TESTCASE = True
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
-    def test_scripted_resolver(self):
-        """Use a scripted resolver to set a by symbol name breakpoint"""
-        self.build()
-        self.do_test()
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
-    def test_search_depths(self):
-        """ Make sure we are called at the right depths depending on what we return
-            from __get_depth__"""
-        self.build()
-        self.do_test_depths()
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24528")
-    def test_command_line(self):
-        """ Make sure we are called at the right depths depending on what we return
-            from __get_depth__"""
-        self.build()
-        self.do_test_cli()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def make_target_and_import(self):
-        target = lldbutil.run_to_breakpoint_make_target(self)
-        interp = self.dbg.GetCommandInterpreter()
-        error = lldb.SBError()
-
-        script_name = os.path.join(self.getSourceDir(), "resolver.py")
-        source_name = os.path.join(self.getSourceDir(), "main.c")
-
-        command = "command script import " + script_name
-        result = lldb.SBCommandReturnObject()
-        interp.HandleCommand(command, result)
-        self.assertTrue(result.Succeeded(), "com scr imp failed: %s"%(result.GetError()))
-        return target
-
-    def make_extra_args(self):
-        json_string = '{"symbol":"break_on_me", "test1": "value1"}'
-        json_stream = lldb.SBStream()
-        json_stream.Print(json_string)
-        extra_args = lldb.SBStructuredData()
-        error = extra_args.SetFromJSON(json_stream)
-        self.assertTrue(error.Success(), "Error making SBStructuredData: %s"%(error.GetCString()))
-        return extra_args
-
-    def do_test(self):
-        """This reads in a python file and sets a breakpoint using it."""
-
-        target = self.make_target_and_import()
-        extra_args = self.make_extra_args()
-
-        file_list = lldb.SBFileSpecList()
-        module_list = lldb.SBFileSpecList()
-
-        # Make breakpoints with this resolver using different filters, first ones that will take:
-        right = []
-        # one with no file or module spec - this one should fire:
-        right.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-
-        # one with the right source file and no module - should also fire:
-        file_list.Append(lldb.SBFileSpec("main.c"))
-        right.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-        # Make sure the help text shows up in the "break list" output:
-        self.expect("break list", substrs=["I am a python breakpoint resolver"], msg="Help is listed in break list")
-
-        # one with the right source file and right module - should also fire:
-        module_list.Append(lldb.SBFileSpec("a.out"))
-        right.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-
-        # And one with no source file but the right module:
-        file_list.Clear()
-        right.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-
-        # Make sure these all got locations:
-        for i in range (0, len(right)):
-            self.assertTrue(right[i].GetNumLocations() >= 1, "Breakpoint %d has no locations."%(i))
-
-        # Now some ones that won't take:
-
-        module_list.Clear()
-        file_list.Clear()
-        wrong = []
-
-        # one with the wrong module - should not fire:
-        module_list.Append(lldb.SBFileSpec("noSuchModule"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-
-        # one with the wrong file - also should not fire:
-        file_list.Clear()
-        module_list.Clear()
-        file_list.Append(lldb.SBFileSpec("noFileOfThisName.xxx"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list))
-        
-        # Now make sure the CU level iteration obeys the file filters:
-        file_list.Clear()
-        module_list.Clear()
-        file_list.Append(lldb.SBFileSpec("no_such_file.xxx"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.ResolverCUDepth", extra_args, module_list, file_list))
-
-        # And the Module filters:
-        file_list.Clear()
-        module_list.Clear()
-        module_list.Append(lldb.SBFileSpec("NoSuchModule.dylib"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.ResolverCUDepth", extra_args, module_list, file_list))
-
-        # Now make sure the Function level iteration obeys the file filters:
-        file_list.Clear()
-        module_list.Clear()
-        file_list.Append(lldb.SBFileSpec("no_such_file.xxx"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.ResolverFuncDepth", extra_args, module_list, file_list))
-
-        # And the Module filters:
-        file_list.Clear()
-        module_list.Clear()
-        module_list.Append(lldb.SBFileSpec("NoSuchModule.dylib"))
-        wrong.append(target.BreakpointCreateFromScript("resolver.ResolverFuncDepth", extra_args, module_list, file_list))
-
-        # Make sure these didn't get locations:
-        for i in range(0, len(wrong)):
-            self.assertEqual(wrong[i].GetNumLocations(), 0, "Breakpoint %d has locations."%(i))
-
-        # Now run to main and ensure we hit the breakpoints we should have:
-
-        lldbutil.run_to_breakpoint_do_run(self, target, right[0])
-        
-        # Test the hit counts:
-        for i in range(0, len(right)):
-            self.assertEqual(right[i].GetHitCount(), 1, "Breakpoint %d has the wrong hit count"%(i))
-
-        for i in range(0, len(wrong)):
-            self.assertEqual(wrong[i].GetHitCount(), 0, "Breakpoint %d has the wrong hit count"%(i))
-
-    def do_test_depths(self):
-        """This test uses a class variable in resolver.Resolver which gets set to 1 if we saw
-           compile unit and 2 if we only saw modules.  If the search depth is module, you get passed just
-           the modules with no comp_unit.  If the depth is comp_unit you get comp_units.  So we can use
-           this to test that our callback gets called at the right depth."""
-
-        target = self.make_target_and_import()
-        extra_args = self.make_extra_args()
-
-        file_list = lldb.SBFileSpecList()
-        module_list = lldb.SBFileSpecList()
-        module_list.Append(lldb.SBFileSpec("a.out"))
-
-        # Make a breakpoint that has no __get_depth__, check that that is converted to eSearchDepthModule:
-        bkpt = target.BreakpointCreateFromScript("resolver.Resolver", extra_args, module_list, file_list)
-        self.assertTrue(bkpt.GetNumLocations() > 0, "Resolver got no locations.")
-        self.expect("script print(resolver.Resolver.got_files)", substrs=["2"], msg="Was only passed modules")
-        
-        # Make a breakpoint that asks for modules, check that we didn't get any files:
-        bkpt = target.BreakpointCreateFromScript("resolver.ResolverModuleDepth", extra_args, module_list, file_list)
-        self.assertTrue(bkpt.GetNumLocations() > 0, "ResolverModuleDepth got no locations.")
-        self.expect("script print(resolver.Resolver.got_files)", substrs=["2"], msg="Was only passed modules")
-        
-        # Make a breakpoint that asks for compile units, check that we didn't get any files:
-        bkpt = target.BreakpointCreateFromScript("resolver.ResolverCUDepth", extra_args, module_list, file_list)
-        self.assertTrue(bkpt.GetNumLocations() > 0, "ResolverCUDepth got no locations.")
-        self.expect("script print(resolver.Resolver.got_files)", substrs=["1"], msg="Was passed compile units")
-
-        # Make a breakpoint that returns a bad value - we should convert that to "modules" so check that:
-        bkpt = target.BreakpointCreateFromScript("resolver.ResolverBadDepth", extra_args, module_list, file_list)
-        self.assertTrue(bkpt.GetNumLocations() > 0, "ResolverBadDepth got no locations.")
-        self.expect("script print(resolver.Resolver.got_files)", substrs=["2"], msg="Was only passed modules")
-
-        # Make a breakpoint that searches at function depth:
-        bkpt = target.BreakpointCreateFromScript("resolver.ResolverFuncDepth", extra_args, module_list, file_list)
-        self.assertTrue(bkpt.GetNumLocations() > 0, "ResolverFuncDepth got no locations.")
-        self.expect("script print(resolver.Resolver.got_files)", substrs=["3"], msg="Was only passed modules")
-        self.expect("script print(resolver.Resolver.func_list)", substrs=["break_on_me", "main", "test_func"], msg="Saw all the functions")
-
-    def do_test_cli(self):
-        target = self.make_target_and_import()
-
-        lldbutil.run_break_set_by_script(self, "resolver.Resolver", extra_options="-k symbol -v break_on_me")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/main.c
deleted file mode 100644
index b91ccfc1b43..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/main.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-
-int
-test_func()
-{
-  return printf("I am a test function.");
-}
-
-void
-break_on_me()
-{
-  printf("I was called.\n");
-}
-
-int
-main()
-{
-  break_on_me();
-  test_func();
-  return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/resolver.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/resolver.py
deleted file mode 100644
index 61f5f2df20a..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/scripted_bkpt/resolver.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import lldb
-
-class Resolver:
-  got_files = 0
-  func_list = []
-
-  def __init__(self, bkpt, extra_args, dict):
-      self.bkpt = bkpt
-      self.extra_args = extra_args
-      Resolver.func_list = []
-      Resolver.got_files = 0
-
-  def __callback__(self, sym_ctx):
-      sym_name = "not_a_real_function_name"
-      sym_item = self.extra_args.GetValueForKey("symbol")
-      if sym_item.IsValid():
-          sym_name = sym_item.GetStringValue(1000)
-
-      if sym_ctx.compile_unit.IsValid():
-          Resolver.got_files = 1
-      else:
-          Resolver.got_files = 2
-      
-      if sym_ctx.function.IsValid():
-        Resolver.got_files = 3
-        func_name = sym_ctx.function.GetName()
-        Resolver.func_list.append(func_name)
-        if sym_name == func_name:
-          self.bkpt.AddLocation(sym_ctx.function.GetStartAddress())
-        return
-
-      if sym_ctx.module.IsValid():
-          sym = sym_ctx.module.FindSymbol(sym_name, lldb.eSymbolTypeCode)
-          if sym.IsValid():
-              self.bkpt.AddLocation(sym.GetStartAddress())
-
-  def get_short_help(self):
-      return "I am a python breakpoint resolver"
-
-class ResolverModuleDepth(Resolver):
-    def __get_depth__ (self):
-        return lldb.eSearchDepthModule
-
-class ResolverCUDepth(Resolver):
-    def __get_depth__ (self):
-        return lldb.eSearchDepthCompUnit
-
-class ResolverFuncDepth(Resolver):
-    def __get_depth__ (self):
-        return lldb.eSearchDepthFunction
-
-class ResolverBadDepth(Resolver):
-    def __get_depth__ (self):
-        return lldb.kLastSearchDepthKind + 1
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
deleted file mode 100644
index 086203ec54a..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/TestBreakpointSerialization.py
+++ /dev/null
@@ -1,291 +0,0 @@
-"""
-Test breakpoint serialization.
-"""
-
-from __future__ import print_function
-
-
-import os
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class BreakpointSerialization(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-    NO_DEBUG_INFO_TESTCASE = True
-
-    @add_test_categories(['pyapi'])
-    def test_resolvers(self):
-        """Use Python APIs to test that we serialize resolvers."""
-        self.build()
-        self.setup_targets_and_cleanup()
-        self.do_check_resolvers()
-
-    def test_filters(self):
-        """Use Python APIs to test that we serialize search filters correctly."""
-        self.build()
-        self.setup_targets_and_cleanup()
-        self.do_check_filters()
-
-    def test_options(self):
-        """Use Python APIs to test that we serialize breakpoint options correctly."""
-        self.build()
-        self.setup_targets_and_cleanup()
-        self.do_check_options()
-
-    def test_appending(self):
-        """Use Python APIs to test that we serialize breakpoint options correctly."""
-        self.build()
-        self.setup_targets_and_cleanup()
-        self.do_check_appending()
-
-    def test_name_filters(self):
-        """Use python APIs to test that reading in by name works correctly."""
-        self.build()
-        self.setup_targets_and_cleanup()
-        self.do_check_names()
-
-    def setup_targets_and_cleanup(self):
-        def cleanup ():
-            self.RemoveTempFile(self.bkpts_file_path)
-
-            if self.orig_target.IsValid():
-                self.dbg.DeleteTarget(self.orig_target)
-                self.dbg.DeleteTarget(self.copy_target)
-
-        self.addTearDownHook(cleanup)
-        self.RemoveTempFile(self.bkpts_file_path)
-
-        exe = self.getBuildArtifact("a.out")
-
-        # Create the targets we are making breakpoints in and copying them to:
-        self.orig_target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.orig_target, VALID_TARGET)
-
-        self.copy_target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.copy_target, VALID_TARGET)
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-        self.bkpts_file_path = self.getBuildArtifact("breakpoints.json")
-        self.bkpts_file_spec = lldb.SBFileSpec(self.bkpts_file_path)
-
-    def check_equivalence(self, source_bps, do_write = True):
-
-        error = lldb.SBError()
-
-        if (do_write):
-            error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, source_bps)
-            self.assertTrue(error.Success(), "Failed writing breakpoints to file: %s."%(error.GetCString()))
-
-        copy_bps = lldb.SBBreakpointList(self.copy_target)
-        error = self.copy_target.BreakpointsCreateFromFile(self.bkpts_file_spec, copy_bps)
-        self.assertTrue(error.Success(), "Failed reading breakpoints from file: %s"%(error.GetCString()))
-
-        num_source_bps = source_bps.GetSize()
-        num_copy_bps = copy_bps.GetSize()
-        self.assertTrue(num_source_bps == num_copy_bps, "Didn't get same number of input and output breakpoints - orig: %d copy: %d"%(num_source_bps, num_copy_bps))
-
-        for i in range(0, num_source_bps):
-            source_bp = source_bps.GetBreakpointAtIndex(i)
-            source_desc = lldb.SBStream()
-            source_bp.GetDescription(source_desc, False)
-            source_text = source_desc.GetData()
-
-            # I am assuming here that the breakpoints will get written out in breakpoint ID order, and
-            # read back in ditto.  That is true right now, and I can't see any reason to do it differently
-            # but if we do we can go to writing the breakpoints one by one, or sniffing the descriptions to
-            # see which one is which.
-            copy_id = source_bp.GetID()
-            copy_bp = copy_bps.FindBreakpointByID(copy_id)
-            self.assertTrue(copy_bp.IsValid(), "Could not find copy breakpoint %d."%(copy_id))
-
-            copy_desc = lldb.SBStream()
-            copy_bp.GetDescription(copy_desc, False)
-            copy_text = copy_desc.GetData()
-
-            # These two should be identical.
-            # print ("Source text for %d is %s."%(i, source_text))
-            self.assertTrue (source_text == copy_text, "Source and dest breakpoints are not identical: \nsource: %s\ndest: %s"%(source_text, copy_text))
-
-    def do_check_resolvers(self):
-        """Use Python APIs to check serialization of breakpoint resolvers"""
-
-        empty_module_list = lldb.SBFileSpecList()
-        empty_cu_list = lldb.SBFileSpecList()
-        blubby_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "blubby.c"))
-
-        # It isn't actually important for these purposes that these breakpoint
-        # actually have locations.
-        source_bps = lldb.SBBreakpointList(self.orig_target)
-        source_bps.Append(self.orig_target.BreakpointCreateByLocation("blubby.c", 666))
-        # Make sure we do one breakpoint right:
-        self.check_equivalence(source_bps)
-        source_bps.Clear()
-
-        source_bps.Append(self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, empty_module_list, empty_cu_list))
-        source_bps.Append(self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeFull, empty_module_list,empty_cu_list))
-        source_bps.Append(self.orig_target.BreakpointCreateBySourceRegex("dont really care", blubby_file_spec))
-
-        # And some number greater than one:
-        self.check_equivalence(source_bps)
-
-    def do_check_filters(self):
-        """Use Python APIs to check serialization of breakpoint filters."""
-        module_list = lldb.SBFileSpecList()
-        module_list.Append(lldb.SBFileSpec("SomeBinary"))
-        module_list.Append(lldb.SBFileSpec("SomeOtherBinary"))
-
-        cu_list = lldb.SBFileSpecList()
-        cu_list.Append(lldb.SBFileSpec("SomeCU.c"))
-        cu_list.Append(lldb.SBFileSpec("AnotherCU.c"))
-        cu_list.Append(lldb.SBFileSpec("ThirdCU.c"))
-
-        blubby_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "blubby.c"))
-
-        # It isn't actually important for these purposes that these breakpoint
-        # actually have locations.
-        source_bps = lldb.SBBreakpointList(self.orig_target)
-        bkpt = self.orig_target.BreakpointCreateByLocation(blubby_file_spec, 666, 0, module_list)
-        source_bps.Append(bkpt)
-
-        # Make sure we do one right:
-        self.check_equivalence(source_bps)
-        source_bps.Clear()
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, module_list, cu_list)
-        source_bps.Append(bkpt)
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeFull, module_list, cu_list)
-        source_bps.Append(bkpt)
-        bkpt = self.orig_target.BreakpointCreateBySourceRegex("dont really care", blubby_file_spec)
-        source_bps.Append(bkpt)
-
-        # And some number greater than one:
-        self.check_equivalence(source_bps)
-
-    def do_check_options(self):
-        """Use Python APIs to check serialization of breakpoint options."""
-
-        empty_module_list = lldb.SBFileSpecList()
-        empty_cu_list = lldb.SBFileSpecList()
-        blubby_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "blubby.c"))
-
-        # It isn't actually important for these purposes that these breakpoint
-        # actually have locations.
-        source_bps = lldb.SBBreakpointList(self.orig_target)
-
-        bkpt = self.orig_target.BreakpointCreateByLocation(
-            lldb.SBFileSpec("blubby.c"), 666, 333, 0, lldb.SBFileSpecList())
-        bkpt.SetEnabled(False)
-        bkpt.SetOneShot(True)
-        bkpt.SetThreadID(10)
-        source_bps.Append(bkpt)
-
-        # Make sure we get one right:
-        self.check_equivalence(source_bps)
-        source_bps.Clear()
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, empty_module_list, empty_cu_list)
-        bkpt.SetIgnoreCount(10)
-        bkpt.SetThreadName("grubby")
-        source_bps.Append(bkpt)
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, empty_module_list, empty_cu_list)
-        bkpt.SetCondition("gonna remove this")
-        bkpt.SetCondition("")
-        source_bps.Append(bkpt)
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeFull, empty_module_list,empty_cu_list)
-        bkpt.SetCondition("something != something_else")
-        bkpt.SetQueueName("grubby")
-        bkpt.AddName("FirstName")
-        bkpt.AddName("SecondName")
-        bkpt.SetScriptCallbackBody('\tprint("I am a function that prints.")\n\tprint("I don\'t do anything else")\n')
-        source_bps.Append(bkpt)
-
-        bkpt = self.orig_target.BreakpointCreateBySourceRegex("dont really care", blubby_file_spec)
-        cmd_list = lldb.SBStringList()
-        cmd_list.AppendString("frame var")
-        cmd_list.AppendString("thread backtrace")
-
-        bkpt.SetCommandLineCommands(cmd_list)
-        source_bps.Append(bkpt)
-
-        self.check_equivalence(source_bps)
-
-    def do_check_appending(self):
-        """Use Python APIs to check appending to already serialized options."""
-
-        empty_module_list = lldb.SBFileSpecList()
-        empty_cu_list = lldb.SBFileSpecList()
-        blubby_file_spec = lldb.SBFileSpec(os.path.join(self.getSourceDir(), "blubby.c"))
-
-        # It isn't actually important for these purposes that these breakpoint
-        # actually have locations.
-
-        all_bps = lldb.SBBreakpointList(self.orig_target)
-        source_bps = lldb.SBBreakpointList(self.orig_target)
-
-        bkpt = self.orig_target.BreakpointCreateByLocation(
-            lldb.SBFileSpec("blubby.c"), 666, 333, 0, lldb.SBFileSpecList())
-        bkpt.SetEnabled(False)
-        bkpt.SetOneShot(True)
-        bkpt.SetThreadID(10)
-        source_bps.Append(bkpt)
-        all_bps.Append(bkpt)
-
-        error = lldb.SBError()
-        error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, source_bps)
-        self.assertTrue(error.Success(), "Failed writing breakpoints to file: %s."%(error.GetCString()))
-
-        source_bps.Clear()
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeAuto, empty_module_list, empty_cu_list)
-        bkpt.SetIgnoreCount(10)
-        bkpt.SetThreadName("grubby")
-        source_bps.Append(bkpt)
-        all_bps.Append(bkpt)
-
-        bkpt = self.orig_target.BreakpointCreateByName("blubby", lldb.eFunctionNameTypeFull, empty_module_list,empty_cu_list)
-        bkpt.SetCondition("something != something_else")
-        bkpt.SetQueueName("grubby")
-        bkpt.AddName("FirstName")
-        bkpt.AddName("SecondName")
-
-        source_bps.Append(bkpt)
-        all_bps.Append(bkpt)
-
-        error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, source_bps, True)
-        self.assertTrue(error.Success(), "Failed appending breakpoints to file: %s."%(error.GetCString()))
-
-        self.check_equivalence(all_bps)
-
-    def do_check_names(self):
-        bkpt = self.orig_target.BreakpointCreateByLocation(
-            lldb.SBFileSpec("blubby.c"), 666, 333, 0, lldb.SBFileSpecList())
-        good_bkpt_name = "GoodBreakpoint"
-        write_bps = lldb.SBBreakpointList(self.orig_target)
-        bkpt.AddName(good_bkpt_name)
-        write_bps.Append(bkpt)
-
-        error = lldb.SBError()
-        error = self.orig_target.BreakpointsWriteToFile(self.bkpts_file_spec, write_bps)
-        self.assertTrue(error.Success(), "Failed writing breakpoints to file: %s."%(error.GetCString()))
-
-        copy_bps = lldb.SBBreakpointList(self.copy_target)
-        names_list = lldb.SBStringList()
-        names_list.AppendString("NoSuchName")
-
-        error = self.copy_target.BreakpointsCreateFromFile(self.bkpts_file_spec, names_list, copy_bps)
-        self.assertTrue(error.Success(), "Failed reading breakpoints from file: %s"%(error.GetCString()))
-        self.assertTrue(copy_bps.GetSize() == 0, "Found breakpoints with a nonexistent name.")
-
-        names_list.AppendString(good_bkpt_name)
-        error = self.copy_target.BreakpointsCreateFromFile(self.bkpts_file_spec, names_list, copy_bps)
-        self.assertTrue(error.Success(), "Failed reading breakpoints from file: %s"%(error.GetCString()))
-        self.assertTrue(copy_bps.GetSize() == 1, "Found the matching breakpoint.")
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/main.c
deleted file mode 100644
index b1ed4465c1d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/serialize/main.c
+++ /dev/null
@@ -1,53 +0,0 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
-//
-// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
-// See https://llvm.org/LICENSE.txt for license information.
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-//
-//===----------------------------------------------------------------------===//
-#include <stdio.h>
-
-// This simple program is to demonstrate the capability of the lldb command
-// "breakpoint modify -i <count> breakpt-id" to set the number of times a
-// breakpoint is skipped before stopping.  Ignore count can also be set upon
-// breakpoint creation by 'breakpoint set ... -i <count>'.
-
-int a(int);
-int b(int);
-int c(int);
-
-int a(int val)
-{
-    if (val <= 1)
-        return b(val);
-    else if (val >= 3)
-        return c(val); // a(3) -> c(3) Find the call site of c(3).
-
-    return val;
-}
-
-int b(int val)
-{
-    return c(val);
-}
-
-int c(int val)
-{
-    return val + 3; // Find the line number of function "c" here.
-}
-
-int main (int argc, char const *argv[])
-{
-    int A1 = a(1);  // a(1) -> b(1) -> c(1)
-    printf("a(1) returns %d\n", A1);
-    
-    int B2 = b(2);  // b(2) -> c(2) Find the call site of b(2).
-    printf("b(2) returns %d\n", B2);
-    
-    int A3 = a(3);  // a(3) -> c(3) Find the call site of a(3).
-    printf("a(3) returns %d\n", A3);
-    
-    int C1 = c(5); // Find the call site of c in main.
-    printf ("c(5) returns %d\n", C1);
-    return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/Makefile
deleted file mode 100644
index ac984f101c1..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c a.c
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
deleted file mode 100644
index 22589898060..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/TestSourceRegexBreakpoints.py
+++ /dev/null
@@ -1,104 +0,0 @@
-"""
-Test lldb breakpoint setting by source regular expression.
-This test just tests the source file & function restrictions.
-"""
-
-from __future__ import print_function
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class TestSourceRegexBreakpoints(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def test_location(self):
-        self.build()
-        self.source_regex_locations()
-
-    def test_restrictions(self):
-        self.build()
-        self.source_regex_restrictions()
-
-    def source_regex_locations(self):
-        """ Test that restricting source expressions to files & to functions. """
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # First look just in main:
-        target_files = lldb.SBFileSpecList()
-        target_files.Append(lldb.SBFileSpec("a.c"))
-
-        func_names = lldb.SBStringList()
-        func_names.AppendString("a_func")
-
-        source_regex = "Set . breakpoint here"
-        main_break = target.BreakpointCreateBySourceRegex(
-            source_regex, lldb.SBFileSpecList(), target_files, func_names)
-        num_locations = main_break.GetNumLocations()
-        self.assertTrue(
-            num_locations == 1,
-            "a.c in a_func should give one breakpoint, got %d." %
-            (num_locations))
-
-        loc = main_break.GetLocationAtIndex(0)
-        self.assertTrue(loc.IsValid(), "Got a valid location.")
-        address = loc.GetAddress()
-        self.assertTrue(
-            address.IsValid(),
-            "Got a valid address from the location.")
-
-        a_func_line = line_number("a.c", "Set A breakpoint here")
-        line_entry = address.GetLineEntry()
-        self.assertTrue(line_entry.IsValid(), "Got a valid line entry.")
-        self.assertTrue(line_entry.line == a_func_line,
-                        "Our line number matches the one lldbtest found.")
-
-    def source_regex_restrictions(self):
-        """ Test that restricting source expressions to files & to functions. """
-        # Create a target by the debugger.
-        exe = self.getBuildArtifact("a.out")
-        target = self.dbg.CreateTarget(exe)
-        self.assertTrue(target, VALID_TARGET)
-
-        # First look just in main:
-        target_files = lldb.SBFileSpecList()
-        target_files.Append(lldb.SBFileSpec("main.c"))
-        source_regex = "Set . breakpoint here"
-        main_break = target.BreakpointCreateBySourceRegex(
-            source_regex, lldb.SBFileSpecList(), target_files, lldb.SBStringList())
-
-        num_locations = main_break.GetNumLocations()
-        self.assertTrue(
-            num_locations == 2,
-            "main.c should have 2 matches, got %d." %
-            (num_locations))
-
-        # Now look in both files:
-        target_files.Append(lldb.SBFileSpec("a.c"))
-
-        main_break = target.BreakpointCreateBySourceRegex(
-            source_regex, lldb.SBFileSpecList(), target_files, lldb.SBStringList())
-
-        num_locations = main_break.GetNumLocations()
-        self.assertTrue(
-            num_locations == 4,
-            "main.c and a.c should have 4 matches, got %d." %
-            (num_locations))
-
-        # Now restrict it to functions:
-        func_names = lldb.SBStringList()
-        func_names.AppendString("main_func")
-        main_break = target.BreakpointCreateBySourceRegex(
-            source_regex, lldb.SBFileSpecList(), target_files, func_names)
-
-        num_locations = main_break.GetNumLocations()
-        self.assertTrue(
-            num_locations == 2,
-            "main_func in main.c and a.c should have 2 matches, got %d." %
-            (num_locations))
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.c
deleted file mode 100644
index 056583f1c42..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <stdio.h>
-
-#include "a.h"
-
-static int
-main_func(int input)
-{
-  return printf("Set B breakpoint here: %d", input);
-}
-
-int
-a_func(int input)
-{
-  input += 1; // Set A breakpoint here;
-  return main_func(input);
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.h b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.h
deleted file mode 100644
index f578ac0304c..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/a.h
+++ /dev/null
@@ -1 +0,0 @@
-int a_func(int);
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/main.c
deleted file mode 100644
index 9c8625e877f..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/source_regexp/main.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <stdio.h>
-#include "a.h"
-
-int
-main_func(int input)
-{
-  return printf("Set B breakpoint here: %d.\n", input);
-}
-
-int
-main()
-{
-  a_func(10);
-  main_func(10);
-  printf("Set a breakpoint here:\n");
-  return 0;
-}
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile
deleted file mode 100644
index f89b52a972e..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-ifneq (,$(findstring icc,$(CC)))
-    CXXFLAGS += -debug inline-debug-info
-endif
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
deleted file mode 100644
index 07fd04940d9..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/TestStepOverBreakpoint.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-Test that breakpoints do not affect stepping.
-Check for correct StopReason when stepping to the line with breakpoint
-which chould be eStopReasonBreakpoint in general,
-and eStopReasonPlanComplete when breakpoint's condition fails.
-"""
-
-from __future__ import print_function
-
-import unittest2
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-class StepOverBreakpointsTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        TestBase.setUp(self)
-
-        self.build()
-        exe = self.getBuildArtifact("a.out")
-        src = lldb.SBFileSpec("main.cpp")
-
-        # Create a target by the debugger.
-        self.target = self.dbg.CreateTarget(exe)
-        self.assertTrue(self.target, VALID_TARGET)
-
-        # Setup four breakpoints, two of them with false condition
-        self.line1 = line_number('main.cpp', "breakpoint_1")
-        self.line4 = line_number('main.cpp', "breakpoint_4")
-
-        self.breakpoint1 = self.target.BreakpointCreateByLocation(src, self.line1)
-        self.assertTrue(
-            self.breakpoint1 and self.breakpoint1.GetNumLocations() == 1,
-            VALID_BREAKPOINT)
-
-        self.breakpoint2 = self.target.BreakpointCreateBySourceRegex("breakpoint_2", src)
-        self.breakpoint2.GetLocationAtIndex(0).SetCondition('false')
-
-        self.breakpoint3 = self.target.BreakpointCreateBySourceRegex("breakpoint_3", src)
-        self.breakpoint3.GetLocationAtIndex(0).SetCondition('false')
-
-        self.breakpoint4 = self.target.BreakpointCreateByLocation(src, self.line4)
-
-        # Start debugging
-        self.process = self.target.LaunchSimple(
-            None, None, self.get_process_working_directory())
-        self.assertIsNotNone(self.process, PROCESS_IS_VALID)
-        self.thread = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, self.breakpoint1)
-        self.assertIsNotNone(self.thread, "Didn't stop at breakpoint 1.")
-
-    def test_step_instruction(self):
-        # Count instructions between breakpoint_1 and breakpoint_4
-        contextList = self.target.FindFunctions('main', lldb.eFunctionNameTypeAuto)
-        self.assertEquals(contextList.GetSize(), 1)
-        symbolContext = contextList.GetContextAtIndex(0)
-        function = symbolContext.GetFunction()
-        self.assertTrue(function)
-        instructions = function.GetInstructions(self.target)
-        addr_1 = self.breakpoint1.GetLocationAtIndex(0).GetAddress()
-        addr_4 = self.breakpoint4.GetLocationAtIndex(0).GetAddress()
-
-        # if third argument is true then the count will be the number of
-        # instructions on which a breakpoint can be set.
-        # start = addr_1, end = addr_4, canSetBreakpoint = True
-        steps_expected = instructions.GetInstructionsCount(addr_1, addr_4, True)
-        step_count = 0
-        # Step from breakpoint_1 to breakpoint_4
-        while True:
-            self.thread.StepInstruction(True)
-            step_count = step_count + 1
-            self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-            self.assertTrue(self.thread.GetStopReason() == lldb.eStopReasonPlanComplete or
-                            self.thread.GetStopReason() == lldb.eStopReasonBreakpoint)
-            if (self.thread.GetStopReason() == lldb.eStopReasonBreakpoint) :
-                # we should not stop on breakpoint_2 and _3 because they have false condition
-                self.assertEquals(self.thread.GetFrameAtIndex(0).GetLineEntry().GetLine(), self.line4)
-                # breakpoint_2 and _3 should not affect step count
-                self.assertTrue(step_count >= steps_expected)
-                break
-
-        # Run the process until termination
-        self.process.Continue()
-        self.assertEquals(self.process.GetState(), lldb.eStateExited)
-
-    @skipIf(bugnumber="llvm.org/pr31972", hostoslist=["windows"])
-    def test_step_over(self):
-        #lldb.DBG.EnableLog("lldb", ["step","breakpoint"])
-
-        self.thread.StepOver()
-        # We should be stopped at the breakpoint_2 line with stop plan complete reason
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        self.assertEquals(self.thread.GetStopReason(), lldb.eStopReasonPlanComplete)
-
-        self.thread.StepOver()
-        # We should be stopped at the breakpoint_3 line with stop plan complete reason
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        self.assertEquals(self.thread.GetStopReason(), lldb.eStopReasonPlanComplete)
-
-        self.thread.StepOver()
-        # We should be stopped at the breakpoint_4
-        self.assertEquals(self.process.GetState(), lldb.eStateStopped)
-        self.assertEquals(self.thread.GetStopReason(), lldb.eStopReasonBreakpoint)
-        thread1 = lldbutil.get_one_thread_stopped_at_breakpoint(self.process, self.breakpoint4)
-        self.assertEquals(self.thread, thread1, "Didn't stop at breakpoint 4.")
-
-        # Check that stepping does not affect breakpoint's hit count
-        self.assertEquals(self.breakpoint1.GetHitCount(), 1)
-        self.assertEquals(self.breakpoint2.GetHitCount(), 0)
-        self.assertEquals(self.breakpoint3.GetHitCount(), 0)
-        self.assertEquals(self.breakpoint4.GetHitCount(), 1)
-
-        # Run the process until termination
-        self.process.Continue()
-        self.assertEquals(self.process.GetState(), lldb.eStateExited)
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/main.cpp
deleted file mode 100644
index 8cfd34b73b5..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/step_over_breakpoint/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-
-int func() { return 1; }
-
-int
-main(int argc, char const *argv[])
-{
-    int a = 0;      // breakpoint_1
-    int b = func(); // breakpoint_2
-    a = b + func(); // breakpoint_3
-    return 0;       // breakpoint_4
-}
-
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile
deleted file mode 100644
index 314f1cb2f07..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/inheritance/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/Makefile
deleted file mode 100644
index 314f1cb2f07..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/frame-diagnose/virtual-method-call/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile
index 8af06446ece..8af06446ece 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/TestPluginCommands.py
index e81d4076574..e81d4076574 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/TestPluginCommands.py
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/plugin.cpp.template
index 1667c0d721e..1667c0d721e 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/plugin.cpp.template
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/Makefile
deleted file mode 100644
index 314f1cb2f07..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_hits/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/Makefile
deleted file mode 100644
index b09a579159d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_disable/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/Makefile
deleted file mode 100644
index b09a579159d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile
deleted file mode 100644
index b09a579159d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/Makefile
deleted file mode 100644
index b09a579159d..00000000000
--- a/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_size/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../../make
-
-C_SOURCES := main.c
-
-include $(LEVEL)/Makefile.rules