Move lldb/test to lldb/packages/Python/lldbsuite/test.

This is the conclusion of an effort to get LLDB's Python code
structured into a bona-fide Python package.  This has a number
of benefits, but most notably the ability to more easily share
Python code between different but related pieces of LLDB's Python
infrastructure (for example, `scripts` can now share code with
`test`).

llvm-svn: 251532

1492 files changed, 2066 insertions, 2037 deletions

diff --git a/lldb/test/.categories b/lldb/packages/Python/lldbsuite/test/.categories
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/.categories
+++ b/lldb/packages/Python/lldbsuite/test/.categories
diff --git a/lldb/test/Makefile b/lldb/packages/Python/lldbsuite/test/Makefile
index 4d08ef39d4d..4d08ef39d4d 100644
--- a/lldb/test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/Makefile
diff --git a/lldb/test/README-TestSuite b/lldb/packages/Python/lldbsuite/test/README-TestSuite
index 6df4d7bd7be..6df4d7bd7be 100644
--- a/lldb/test/README-TestSuite
+++ b/lldb/packages/Python/lldbsuite/test/README-TestSuite
diff --git a/lldb/packages/Python/lldbsuite/test/__init__.py b/lldb/packages/Python/lldbsuite/test/__init__.py
index a32aefd5f43..e9277b84b47 100644
--- a/lldb/packages/Python/lldbsuite/test/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/__init__.py
@@ -1 +1,4 @@
 # Module level initialization for the `lldbsuite.test` module.
+
+import dotest
+run_suite = dotest.run_suite
diff --git a/lldb/test/android/platform/Makefile b/lldb/packages/Python/lldbsuite/test/android/platform/Makefile
index 22e42c5a776..22e42c5a776 100644
--- a/lldb/test/android/platform/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/android/platform/Makefile
diff --git a/lldb/test/android/platform/TestDefaultCacheLineSize.py b/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
index 221ff489f6d..221ff489f6d 100644
--- a/lldb/test/android/platform/TestDefaultCacheLineSize.py
+++ b/lldb/packages/Python/lldbsuite/test/android/platform/TestDefaultCacheLineSize.py
diff --git a/lldb/test/android/platform/main.cpp b/lldb/packages/Python/lldbsuite/test/android/platform/main.cpp
index 3fb9edc4727..3fb9edc4727 100644
--- a/lldb/test/android/platform/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/android/platform/main.cpp
diff --git a/lldb/test/api/check_public_api_headers/Makefile b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/api/check_public_api_headers/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/Makefile
diff --git a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
index dc844e3c0ff..dc844e3c0ff 100644
--- a/lldb/test/api/check_public_api_headers/TestPublicAPIHeaders.py
+++ b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/TestPublicAPIHeaders.py
diff --git a/lldb/test/api/check_public_api_headers/main.cpp.template b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/main.cpp.template
index ed754add610..ed754add610 100644
--- a/lldb/test/api/check_public_api_headers/main.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/api/check_public_api_headers/main.cpp.template
diff --git a/lldb/test/api/multiple-debuggers/.categories b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/.categories
index 6e70196ccd7..6e70196ccd7 100644
--- a/lldb/test/api/multiple-debuggers/.categories
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/.categories
diff --git a/lldb/test/api/multiple-debuggers/Makefile b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile
index 08f8850e3e8..08f8850e3e8 100644
--- a/lldb/test/api/multiple-debuggers/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile
diff --git a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
index dff26f3688e..dff26f3688e 100644
--- a/lldb/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
diff --git a/lldb/test/api/multiple-debuggers/multi-process-driver.cpp b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp
index 1c2689ff6c4..1c2689ff6c4 100644
--- a/lldb/test/api/multiple-debuggers/multi-process-driver.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp
diff --git a/lldb/test/api/multiple-debuggers/testprog.cpp b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/testprog.cpp
index c9d1ea14f17..c9d1ea14f17 100644
--- a/lldb/test/api/multiple-debuggers/testprog.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/testprog.cpp
diff --git a/lldb/test/api/multithreaded/Makefile b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
index c974133da75..c974133da75 100644
--- a/lldb/test/api/multithreaded/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/Makefile
diff --git a/lldb/test/api/multithreaded/TestMultithreaded.py b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
index 7edaf1a9623..7edaf1a9623 100644
--- a/lldb/test/api/multithreaded/TestMultithreaded.py
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
diff --git a/lldb/test/api/multithreaded/common.h b/lldb/packages/Python/lldbsuite/test/api/multithreaded/common.h
index a943f28e731..a943f28e731 100644
--- a/lldb/test/api/multithreaded/common.h
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/common.h
diff --git a/lldb/test/api/multithreaded/driver.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp
index fa0c48e0ecf..fa0c48e0ecf 100644
--- a/lldb/test/api/multithreaded/driver.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/driver.cpp
diff --git a/lldb/test/api/multithreaded/inferior.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/inferior.cpp
index 9dbb289f98b..9dbb289f98b 100644
--- a/lldb/test/api/multithreaded/inferior.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/inferior.cpp
diff --git a/lldb/test/api/multithreaded/listener_test.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp
index b20868ff94f..b20868ff94f 100644
--- a/lldb/test/api/multithreaded/listener_test.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/listener_test.cpp
diff --git a/lldb/test/api/multithreaded/lldb-headers.h b/lldb/packages/Python/lldbsuite/test/api/multithreaded/lldb-headers.h
index da0914b3b07..da0914b3b07 100644
--- a/lldb/test/api/multithreaded/lldb-headers.h
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/lldb-headers.h
diff --git a/lldb/test/api/multithreaded/test_breakpoint_callback.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp
index def31f82b0c..def31f82b0c 100644
--- a/lldb/test/api/multithreaded/test_breakpoint_callback.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_breakpoint_callback.cpp
diff --git a/lldb/test/api/multithreaded/test_listener_event_description.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp
index 0d7844dce6d..0d7844dce6d 100644
--- a/lldb/test/api/multithreaded/test_listener_event_description.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_description.cpp
diff --git a/lldb/test/api/multithreaded/test_listener_event_process_state.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp
index 0a698d1081d..0a698d1081d 100644
--- a/lldb/test/api/multithreaded/test_listener_event_process_state.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_event_process_state.cpp
diff --git a/lldb/test/api/multithreaded/test_listener_resume.cpp b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp
index 8cf786b1160..8cf786b1160 100644
--- a/lldb/test/api/multithreaded/test_listener_resume.cpp
+++ b/lldb/packages/Python/lldbsuite/test/api/multithreaded/test_listener_resume.cpp
diff --git a/lldb/test/arm_emulation/TestEmulations.py b/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
index 9ac1060f260..9ac1060f260 100644
--- a/lldb/test/arm_emulation/TestEmulations.py
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/TestEmulations.py
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-1-arm.dat
index 64b2506f9d5..64b2506f9d5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-1-thumb.dat
index daa32d25a41..daa32d25a41 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-10-thumb.dat
index bb3d760219b..bb3d760219b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-10-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-10-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-11-thumb.dat
index e26f2218cbc..e26f2218cbc 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-11-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-11-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-12-thumb.dat
index a7f7344e7d9..a7f7344e7d9 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-12-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-12-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-2-arm.dat
index cf6e0a9779a..cf6e0a9779a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-2-thumb.dat
index 9a178a0a159..9a178a0a159 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-3-arm.dat
index 9fc44b79395..9fc44b79395 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-3-thumb.dat
index c8f96ec09d3..c8f96ec09d3 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-4-arm.dat
index 12b40ed76fc..12b40ed76fc 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-4-thumb.dat
index 922b8ecdba5..922b8ecdba5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-5-arm.dat
index dfb6a87f014..dfb6a87f014 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-5-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-5-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-5-thumb.dat
index 16ff517436b..16ff517436b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-5-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-5-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-6-arm.dat
index 8a87eff5f00..8a87eff5f00 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-6-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-6-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-6-thumb.dat
index e8abd6950f2..e8abd6950f2 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-6-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-6-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-7-arm.dat
index 312514246e3..312514246e3 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-7-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-7-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-7-thumb.dat
index 506071309d7..506071309d7 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-7-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-7-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-8-arm.dat
index 44a400f5287..44a400f5287 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-8-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-8-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-8-thumb.dat
index 8bc6c789a51..8bc6c789a51 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-8-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-8-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-9-thumb.dat
index 832af4cf0b4..832af4cf0b4 100644
--- a/lldb/test/arm_emulation/new-test-files/test-add-9-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-add-9-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-bic-1-arm.dat
index c1cd4f15ab3..c1cd4f15ab3 100644
--- a/lldb/test/arm_emulation/new-test-files/test-bic-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-bic-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
index c6242265018..c6242265018 100644
--- a/lldb/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-bic-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
index e1922d9edb9..e1922d9edb9 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
index 60a805e09d8..60a805e09d8 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
index 99401bbd2e2..99401bbd2e2 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
index 39ecf947c6d..39ecf947c6d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
index 427d7b27485..427d7b27485 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
index 9738073c038..9738073c038 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldmia-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
index 307402fd2f5..307402fd2f5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
index 471669b0cb6..471669b0cb6 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
index bc7693c9a68..bc7693c9a68 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-10-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
index b5bf18127cd..b5bf18127cd 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-11-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
index 5c3a5485f0b..5c3a5485f0b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-12-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
index 068297e3edc..068297e3edc 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
index 27727831d6d..27727831d6d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
index f0d6d8aaba6..f0d6d8aaba6 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
index 012e1c53e66..012e1c53e66 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
index e2d2aa6aa88..e2d2aa6aa88 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
index 3eb6f167b48..3eb6f167b48 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
index 45210d9600d..45210d9600d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-5-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
index 45289e7e899..45289e7e899 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-5-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
index 0f379fd4980..0f379fd4980 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-6-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
index 5b3c119e743..5b3c119e743 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-6-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
index ff425ef5284..ff425ef5284 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-7-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
index db8d58796ca..db8d58796ca 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-7-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
index c11dfc133e5..c11dfc133e5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-8-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
index 01d7013ceaa..01d7013ceaa 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-8-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
index cc3c4db2f4d..cc3c4db2f4d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldr-9-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
index 970f8aa7c0a..970f8aa7c0a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
index 7ab41ce35db..7ab41ce35db 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
index 70fe6f5cfff..70fe6f5cfff 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrd-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
index 2a47002fb65..2a47002fb65 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrh-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
index cecf397f1d4..cecf397f1d4 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrsh-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
index 660b3d3b5db..660b3d3b5db 100644
--- a/lldb/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-ldrsh-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-1-arm.dat
index 232bc967fed..232bc967fed 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
index 569510dbd3b..569510dbd3b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
index 6bf9b0d7ef7..6bf9b0d7ef7 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-10-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
index 82043ef335b..82043ef335b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-11-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
index 1fce18af917..1fce18af917 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-12-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
index d1c1a4428c9..d1c1a4428c9 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-13-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
index dfd89c265fb..dfd89c265fb 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-14-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
index 0ff8e5d7dc5..0ff8e5d7dc5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-15-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
index 1baf42dfc56..1baf42dfc56 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-16-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
index 70cee03fb54..70cee03fb54 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-17-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
index 1893e188b0d..1893e188b0d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-18-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
index 238e16b4aa4..238e16b4aa4 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-19-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-2-arm.dat
index 6d6c0cbf80c..6d6c0cbf80c 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
index ad6854427fb..ad6854427fb 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
index 15ecd2ebfa0..15ecd2ebfa0 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-20-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
index 6a38f1671b7..6a38f1671b7 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-21-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
index 242b5682419..242b5682419 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-22-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
index 7f57440a842..7f57440a842 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-23-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
index 9a1756e8473..9a1756e8473 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-24-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
index c2fd6a73964..c2fd6a73964 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-25-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
index 2cc155d8071..2cc155d8071 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-26-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
index 0b35377b08e..0b35377b08e 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-27-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
index f7d7778a251..f7d7778a251 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-28-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
index 5e9098f99d2..5e9098f99d2 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-29-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-3-arm.dat
index 1fe7155bd3a..1fe7155bd3a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
index 8ce129682bf..8ce129682bf 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
index a0dddad6b5a..a0dddad6b5a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-30-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
index 20d8dc7c06f..20d8dc7c06f 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-31-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-4-arm.dat
index 8ef83b26805..8ef83b26805 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
index f854ba26641..f854ba26641 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-5-arm.dat
index ee85779083f..ee85779083f 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-5-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-5-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
index d6140bdb92d..d6140bdb92d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-5-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-6-arm.dat
index 863a6d3e9bd..863a6d3e9bd 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-6-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-6-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
index fac96bf5a5a..fac96bf5a5a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-6-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
index c537d30cb24..c537d30cb24 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-7-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
index b724c79a0d5..b724c79a0d5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-8-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
index ccf7ea6c342..ccf7ea6c342 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mov-9-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
index f46b1bfd6e8..f46b1bfd6e8 100644
--- a/lldb/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-moveq-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-movs-1-arm.dat
index 38292508d43..38292508d43 100644
--- a/lldb/test/arm_emulation/new-test-files/test-movs-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-movs-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
index 024dd9fa4bc..024dd9fa4bc 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
index c5c385c8522..c5c385c8522 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
index 10df542fcad..10df542fcad 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
index 3c2f6f4da27..3c2f6f4da27 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
index 742708978b6..742708978b6 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
index ff4ca7331a9..ff4ca7331a9 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
index 4efc18cc5f2..4efc18cc5f2 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
index f8b1569e906..f8b1569e906 100644
--- a/lldb/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-mvn-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-1-arm.dat
index 07163f80aeb..07163f80aeb 100644
--- a/lldb/test/arm_emulation/new-test-files/test-pop-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
index fad6765be9a..fad6765be9a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-2-arm.dat
index 4b6ae43ca28..4b6ae43ca28 100644
--- a/lldb/test/arm_emulation/new-test-files/test-pop-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
index 9f3efe57e9d..9f3efe57e9d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
index a2adc418c4a..a2adc418c4a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-pop-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-1-arm.dat
index b2f6e0965ab..b2f6e0965ab 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-1-thumb.dat
index 6f5b29ed199..6f5b29ed199 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-2-arm.dat
index 6f1f4389e80..6f1f4389e80 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-2-thumb.dat
index 23e4df446bf..23e4df446bf 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-3-arm.dat
index 06847a5ff3b..06847a5ff3b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-3-thumb.dat
index e3330f537cb..e3330f537cb 100644
--- a/lldb/test/arm_emulation/new-test-files/test-push-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-push-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-1-arm.dat
index 70a5be3cb69..70a5be3cb69 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-1-thumb.dat
index 3559652ce6c..3559652ce6c 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-2-arm.dat
index 3d77724b4f9..3d77724b4f9 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-2-thumb.dat
index 73e8cd3e548..73e8cd3e548 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-3-arm.dat
index 97c90a0050c..97c90a0050c 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-3-thumb.dat
index 8e891c04287..8e891c04287 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-4-arm.dat
index ed3b54eaf38..ed3b54eaf38 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-4-thumb.dat
index ec9e2dc1e54..ec9e2dc1e54 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-5-arm.dat
index 98b8dfb16b3..98b8dfb16b3 100644
--- a/lldb/test/arm_emulation/new-test-files/test-str-5-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-str-5-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strb-1-arm.dat
index 2f7320d007a..2f7320d007a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-strb-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strb-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strb-2-arm.dat
index 495c8e720a1..495c8e720a1 100644
--- a/lldb/test/arm_emulation/new-test-files/test-strb-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strb-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
index 494c49af952..494c49af952 100644
--- a/lldb/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strbt-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
index 4876f8741b0..4876f8741b0 100644
--- a/lldb/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strd-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strt-1-arm.dat
index 9fc311565ea..9fc311565ea 100644
--- a/lldb/test/arm_emulation/new-test-files/test-strt-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-strt-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-1-arm.dat
index 98c435d616a..98c435d616a 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
index 482480d0cd4..482480d0cd4 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-10-arm.dat
index 9f07a947f7d..9f07a947f7d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-10-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-10-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-2-arm.dat
index 9a67268196e..9a67268196e 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-2-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-2-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
index 11d213803e2..11d213803e2 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-3-arm.dat
index 4dfe680ce47..4dfe680ce47 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-3-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-3-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
index a017f528430..a017f528430 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-4-arm.dat
index 50d13c99475..50d13c99475 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-4-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-4-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
index 214808d6a42..214808d6a42 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-5-arm.dat
index 58de27b5d4e..58de27b5d4e 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-5-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-5-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
index 12688286685..12688286685 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-5-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-6-arm.dat
index be6891307db..be6891307db 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-6-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-6-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
index d48c42eb8d8..d48c42eb8d8 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-6-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-8-arm.dat
index 21b17dfbcd8..21b17dfbcd8 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-8-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-8-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-9-arm.dat
index 06888ad3a4b..06888ad3a4b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-sub-9-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-sub-9-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-1-arm.dat
index 856a55749b1..856a55749b1 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-1-arm.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-1-arm.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
index 63aa7b8ed13..63aa7b8ed13 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
index 75938b4e1d5..75938b4e1d5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-10-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
index 74bddcea97c..74bddcea97c 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
index 965ebf37017..965ebf37017 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
index 068724170d5..068724170d5 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-4-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
index 72ed2ef25c0..72ed2ef25c0 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-5-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
index 67133b2832e..67133b2832e 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-6-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
index 965ebf37017..965ebf37017 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-8-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
index ea159774316..ea159774316 100644
--- a/lldb/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-subs-9-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
index 22dd9d88b4b..22dd9d88b4b 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
index e69cd9eef2d..e69cd9eef2d 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
index 375a92eaaab..375a92eaaab 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpop-3-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
index ac4ef56be66..ac4ef56be66 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-1-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
index 58055d6539c..58055d6539c 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-2-thumb.dat
diff --git a/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat
index 2658b43bc88..2658b43bc88 100644
--- a/lldb/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat
+++ b/lldb/packages/Python/lldbsuite/test/arm_emulation/new-test-files/test-vpush-3-thumb.dat
diff --git a/lldb/test/attic/dotest.pl b/lldb/packages/Python/lldbsuite/test/attic/dotest.pl
index f093ed8f8f2..f093ed8f8f2 100755..100644
--- a/lldb/test/attic/dotest.pl
+++ b/lldb/packages/Python/lldbsuite/test/attic/dotest.pl
diff --git a/lldb/test/attic/tester.py b/lldb/packages/Python/lldbsuite/test/attic/tester.py
index 5c1a2370ced..5c1a2370ced 100755..100644
--- a/lldb/test/attic/tester.py
+++ b/lldb/packages/Python/lldbsuite/test/attic/tester.py
diff --git a/lldb/test/bench-history b/lldb/packages/Python/lldbsuite/test/bench-history
index 471332b2522..471332b2522 100644
--- a/lldb/test/bench-history
+++ b/lldb/packages/Python/lldbsuite/test/bench-history
diff --git a/lldb/test/bench.py b/lldb/packages/Python/lldbsuite/test/bench.py
index 664aa3a93b8..664aa3a93b8 100755..100644
--- a/lldb/test/bench.py
+++ b/lldb/packages/Python/lldbsuite/test/bench.py
diff --git a/lldb/test/benchmarks/continue/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/benchmarks/continue/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/Makefile
diff --git a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
index a03eb4239ac..a03eb4239ac 100644
--- a/lldb/test/benchmarks/continue/TestBenchmarkContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/TestBenchmarkContinue.py
diff --git a/lldb/test/benchmarks/continue/main.cpp b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/main.cpp
index d715a1150d0..d715a1150d0 100644
--- a/lldb/test/benchmarks/continue/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/continue/main.cpp
diff --git a/lldb/test/benchmarks/disassembly/TestDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
index 69d645a52e0..69d645a52e0 100644
--- a/lldb/test/benchmarks/disassembly/TestDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDisassembly.py
diff --git a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
index 1e1c1d48fd9..1e1c1d48fd9 100644
--- a/lldb/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestDoAttachThenDisassembly.py
diff --git a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
index 4db2d08199b..4db2d08199b 100644
--- a/lldb/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/disassembly/TestXcode41Vs42GDBDisassembly.py
diff --git a/lldb/test/benchmarks/expression/Makefile b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/benchmarks/expression/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/Makefile
diff --git a/lldb/test/benchmarks/expression/TestExpressionCmd.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
index 9540c0ce68d..9540c0ce68d 100644
--- a/lldb/test/benchmarks/expression/TestExpressionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestExpressionCmd.py
diff --git a/lldb/test/benchmarks/expression/TestRepeatedExprs.py b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
index 78111051e2d..78111051e2d 100644
--- a/lldb/test/benchmarks/expression/TestRepeatedExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/TestRepeatedExprs.py
diff --git a/lldb/test/benchmarks/expression/main.cpp b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/main.cpp
index 8f2706e2638..8f2706e2638 100644
--- a/lldb/test/benchmarks/expression/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/expression/main.cpp
diff --git a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
index baad1c4464a..baad1c4464a 100644
--- a/lldb/test/benchmarks/frame_variable/TestFrameVariableResponse.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/frame_variable/TestFrameVariableResponse.py
diff --git a/lldb/test/benchmarks/startup/TestStartupDelays.py b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
index f95225ba92f..f95225ba92f 100644
--- a/lldb/test/benchmarks/startup/TestStartupDelays.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/startup/TestStartupDelays.py
diff --git a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
index cb85dd19948..cb85dd19948 100644
--- a/lldb/test/benchmarks/stepping/TestRunHooksThenSteppings.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestRunHooksThenSteppings.py
diff --git a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
index c1b6e716414..c1b6e716414 100644
--- a/lldb/test/benchmarks/stepping/TestSteppingSpeed.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/stepping/TestSteppingSpeed.py
diff --git a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
index 0c3d34f1507..0c3d34f1507 100644
--- a/lldb/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
+++ b/lldb/packages/Python/lldbsuite/test/benchmarks/turnaround/TestCompileRunToBreakpointTurnaround.py
diff --git a/lldb/test/blacklist.py b/lldb/packages/Python/lldbsuite/test/blacklist.py
index 063bb93593b..063bb93593b 100644
--- a/lldb/test/blacklist.py
+++ b/lldb/packages/Python/lldbsuite/test/blacklist.py
diff --git a/lldb/test/crashinfo.c b/lldb/packages/Python/lldbsuite/test/crashinfo.c
index 19013468bb2..19013468bb2 100644
--- a/lldb/test/crashinfo.c
+++ b/lldb/packages/Python/lldbsuite/test/crashinfo.c
diff --git a/lldb/test/curses_results.py b/lldb/packages/Python/lldbsuite/test/curses_results.py
index f2a60c65f30..f2a60c65f30 100644
--- a/lldb/test/curses_results.py
+++ b/lldb/packages/Python/lldbsuite/test/curses_results.py
diff --git a/lldb/test/dosep.py b/lldb/packages/Python/lldbsuite/test/dosep.py
index 0342d7e97a6..0342d7e97a6 100755..100644
--- a/lldb/test/dosep.py
+++ b/lldb/packages/Python/lldbsuite/test/dosep.py
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
new file mode 100644
index 00000000000..7c08bac48db
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -0,0 +1,2039 @@
+#!/usr/bin/env python
+
+"""
+A simple testing framework for lldb using python's unit testing framework.
+
+Tests for lldb are written as python scripts which take advantage of the script
+bridging provided by LLDB.framework to interact with lldb core.
+
+A specific naming pattern is followed by the .py script to be recognized as
+a module which implements a test scenario, namely, Test*.py.
+
+To specify the directories where "Test*.py" python test scripts are located,
+you need to pass in a list of directory names.  By default, the current
+working directory is searched if nothing is specified on the command line.
+
+Type:
+
+./dotest.py -h
+
+for available options.
+"""
+
+from __future__ import print_function
+
+import use_lldb_suite
+
+import lldbsuite
+
+import atexit
+import commands
+import importlib
+import os
+import dotest_args
+import errno
+import platform
+import progress
+import signal
+import socket
+import subprocess
+import sys
+import test_results
+from test_results import EventBuilder
+import inspect
+import unittest2
+import lldbtest_config
+import test_categories
+
+import six
+
+def is_exe(fpath):
+    """Returns true if fpath is an executable."""
+    return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
+
+def which(program):
+    """Returns the full path to a program; None otherwise."""
+    fpath, fname = os.path.split(program)
+    if fpath:
+        if is_exe(program):
+            return program
+    else:
+        for path in os.environ["PATH"].split(os.pathsep):
+            exe_file = os.path.join(path, program)
+            if is_exe(exe_file):
+                return exe_file
+    return None
+
+class _WritelnDecorator(object):
+    """Used to decorate file-like objects with a handy 'writeln' method"""
+    def __init__(self,stream):
+        self.stream = stream
+
+    def __getattr__(self, attr):
+        if attr in ('stream', '__getstate__'):
+            raise AttributeError(attr)
+        return getattr(self.stream,attr)
+
+    def writeln(self, arg=None):
+        if arg:
+            self.write(arg)
+        self.write('\n') # text-mode streams translate to \r\n if needed
+
+#
+# Global variables:
+#
+
+# The test suite.
+suite = unittest2.TestSuite()
+
+# By default, benchmarks tests are not run.
+just_do_benchmarks_test = False
+
+dont_do_dsym_test = False
+dont_do_dwarf_test = False
+dont_do_dwo_test = False
+
+# The blacklist is optional (-b blacklistFile) and allows a central place to skip
+# testclass's and/or testclass.testmethod's.
+blacklist = None
+
+# The dictionary as a result of sourcing blacklistFile.
+blacklistConfig = {}
+
+# The list of categories we said we care about
+categoriesList = None
+# set to true if we are going to use categories for cherry-picking test cases
+useCategories = False
+# Categories we want to skip
+skipCategories = []
+# use this to track per-category failures
+failuresPerCategory = {}
+
+# The path to LLDB.framework is optional.
+lldbFrameworkPath = None
+
+# The config file is optional.
+configFile = None
+
+# Test suite repeat count.  Can be overwritten with '-# count'.
+count = 1
+
+# The dictionary as a result of sourcing configFile.
+config = {}
+# The pre_flight and post_flight functions come from reading a config file.
+pre_flight = None
+post_flight = None
+# So do the lldbtest_remote_sandbox and lldbtest_remote_shell_template variables.
+lldbtest_remote_sandbox = None
+lldbtest_remote_shell_template = None
+
+# The 'archs' and 'compilers' can be specified via either command line or configFile,
+# with the command line overriding the configFile.  The corresponding options can be
+# specified more than once. For example, "-A x86_64 -A i386" => archs=['x86_64', 'i386']
+# and "-C gcc -C clang" => compilers=['gcc', 'clang'].
+archs = None        # Must be initialized after option parsing
+compilers = None    # Must be initialized after option parsing
+
+# The arch might dictate some specific CFLAGS to be passed to the toolchain to build
+# the inferior programs.  The global variable cflags_extras provides a hook to do
+# just that.
+cflags_extras = ''
+
+# Dump the Python sys.path variable.  Use '-D' to dump sys.path.
+dumpSysPath = False
+
+# Full path of the benchmark executable, as specified by the '-e' option.
+bmExecutable = None
+# The breakpoint specification of bmExecutable, as specified by the '-x' option.
+bmBreakpointSpec = None
+# The benchmark iteration count, as specified by the '-y' option.
+bmIterationCount = -1
+
+# By default, don't exclude any directories.  Use '-X' to add one excluded directory.
+excluded = set(['.svn', '.git'])
+
+# By default, failfast is False.  Use '-F' to overwrite it.
+failfast = False
+
+# The filters (testclass.testmethod) used to admit tests into our test suite.
+filters = []
+
+# The runhooks is a list of lldb commands specifically for the debugger.
+# Use '-k' to specify a runhook.
+runHooks = []
+
+# If '-g' is specified, the filterspec is not exclusive.  If a test module does
+# not contain testclass.testmethod which matches the filterspec, the whole test
+# module is still admitted into our test suite.  fs4all flag defaults to True.
+fs4all = True
+
+# Ignore the build search path relative to this script to locate the lldb.py module.
+ignore = False
+
+# By default, we do not skip build and cleanup.  Use '-S' option to override.
+skip_build_and_cleanup = False
+
+# By default, we skip long running test case.  Use '-l' option to override.
+skip_long_running_test = True
+
+# By default, we print the build dir, lldb version, and svn info.  Use '-n' option to
+# turn it off.
+noHeaders = False
+
+# Parsable mode silences headers, and any other output this script might generate, and instead
+# prints machine-readable output similar to what clang tests produce.
+parsable = False
+
+# The regular expression pattern to match against eligible filenames as our test cases.
+regexp = None
+
+# By default, tests are executed in place and cleanups are performed afterwards.
+# Use '-r dir' option to relocate the tests and their intermediate files to a
+# different directory and to forgo any cleanups.  The directory specified must
+# not exist yet.
+rdir = None
+
+# By default, recorded session info for errored/failed test are dumped into its
+# own file under a session directory named after the timestamp of the test suite
+# run.  Use '-s session-dir-name' to specify a specific dir name.
+sdir_name = None
+
+# Set this flag if there is any session info dumped during the test run.
+sdir_has_content = False
+
+# svn_info stores the output from 'svn info lldb.base.dir'.
+svn_info = ''
+
+# svn_silent means do not try to obtain svn status
+svn_silent = True
+
+# Default verbosity is 0.
+verbose = 1
+
+# Set to True only if verbose is 0 and LLDB trace mode is off.
+progress_bar = False
+
+# By default, search from the script directory.
+# We can't use sys.path[0] to determine the script directory
+# because it doesn't work under a debugger
+testdirs = [ os.path.dirname(os.path.realpath(__file__)) ]
+
+# Separator string.
+separator = '-' * 70
+
+failed = False
+
+# LLDB Remote platform setting
+lldb_platform_name = None
+lldb_platform_url = None
+lldb_platform_working_dir = None
+
+# Parallel execution settings
+is_inferior_test_runner = False
+multiprocess_test_subdir = None
+num_threads = None
+output_on_success = False
+no_multiprocess_test_runner = False
+test_runner_name = None
+
+# Test results handling globals
+results_filename = None
+results_port = None
+results_file_object = None
+results_formatter_name = None
+results_formatter_object = None
+results_formatter_options = None
+
+# The names of all tests. Used to assert we don't have two tests with the same base name.
+all_tests = set()
+
+def usage(parser):
+    parser.print_help()
+    if verbose > 0:
+        print("""
+Examples:
+
+This is an example of using the -f option to pinpoint to a specific test class
+and test method to be run:
+
+$ ./dotest.py -f ClassTypesTestCase.test_with_dsym_and_run_command
+----------------------------------------------------------------------
+Collected 1 test
+
+test_with_dsym_and_run_command (TestClassTypes.ClassTypesTestCase)
+Test 'frame variable this' when stopped on a class constructor. ... ok
+
+----------------------------------------------------------------------
+Ran 1 test in 1.396s
+
+OK
+
+And this is an example of using the -p option to run a single file (the filename
+matches the pattern 'ObjC' and it happens to be 'TestObjCMethods.py'):
+
+$ ./dotest.py -v -p ObjC
+----------------------------------------------------------------------
+Collected 4 tests
+
+test_break_with_dsym (TestObjCMethods.FoundationTestCase)
+Test setting objc breakpoints using '_regexp-break' and 'breakpoint set'. ... ok
+test_break_with_dwarf (TestObjCMethods.FoundationTestCase)
+Test setting objc breakpoints using '_regexp-break' and 'breakpoint set'. ... ok
+test_data_type_and_expr_with_dsym (TestObjCMethods.FoundationTestCase)
+Lookup objective-c data types and evaluate expressions. ... ok
+test_data_type_and_expr_with_dwarf (TestObjCMethods.FoundationTestCase)
+Lookup objective-c data types and evaluate expressions. ... ok
+
+----------------------------------------------------------------------
+Ran 4 tests in 16.661s
+
+OK
+
+Running of this script also sets up the LLDB_TEST environment variable so that
+individual test cases can locate their supporting files correctly.  The script
+tries to set up Python's search paths for modules by looking at the build tree
+relative to this script.  See also the '-i' option in the following example.
+
+Finally, this is an example of using the lldb.py module distributed/installed by
+Xcode4 to run against the tests under the 'forward' directory, and with the '-w'
+option to add some delay between two tests.  It uses ARCH=x86_64 to specify that
+as the architecture and CC=clang to specify the compiler used for the test run:
+
+$ PYTHONPATH=/Xcode4/Library/PrivateFrameworks/LLDB.framework/Versions/A/Resources/Python ARCH=x86_64 CC=clang ./dotest.py -v -w -i forward
+
+Session logs for test failures/errors will go into directory '2010-11-11-13_56_16'
+----------------------------------------------------------------------
+Collected 2 tests
+
+test_with_dsym_and_run_command (TestForwardDeclaration.ForwardDeclarationTestCase)
+Display *bar_ptr when stopped on a function with forward declaration of struct bar. ... ok
+test_with_dwarf_and_run_command (TestForwardDeclaration.ForwardDeclarationTestCase)
+Display *bar_ptr when stopped on a function with forward declaration of struct bar. ... ok
+
+----------------------------------------------------------------------
+Ran 2 tests in 5.659s
+
+OK
+
+The 'Session ...' verbiage is recently introduced (see also the '-s' option) to
+notify the directory containing the session logs for test failures or errors.
+In case there is any test failure/error, a similar message is appended at the
+end of the stderr output for your convenience.
+
+ENABLING LOGS FROM TESTS
+
+Option 1:
+
+Writing logs into different files per test case::
+
+This option is particularly useful when multiple dotest instances are created
+by dosep.py
+
+$ ./dotest.py --channel "lldb all"
+
+$ ./dotest.py --channel "lldb all" --channel "gdb-remote packets"
+
+These log files are written to:
+
+<session-dir>/<test-id>-host.log (logs from lldb host process)
+<session-dir>/<test-id>-server.log (logs from debugserver/lldb-server)
+<session-dir>/<test-id>-<test-result>.log (console logs)
+
+By default, logs from successful runs are deleted.  Use the --log-success flag
+to create reference logs for debugging.
+
+$ ./dotest.py --log-success
+
+Option 2: (DEPRECATED)
+
+The following options can only enable logs from the host lldb process.
+Only categories from the "lldb" or "gdb-remote" channels can be enabled
+They also do not automatically enable logs in locally running debug servers.
+Also, logs from all test case are written into each log file
+
+o LLDB_LOG: if defined, specifies the log file pathname for the 'lldb' subsystem
+  with a default option of 'event process' if LLDB_LOG_OPTION is not defined.
+
+o GDB_REMOTE_LOG: if defined, specifies the log file pathname for the
+  'process.gdb-remote' subsystem with a default option of 'packets' if
+  GDB_REMOTE_LOG_OPTION is not defined.
+
+""")
+    sys.exit(0)
+
+
+def setCrashInfoHook_Mac(text):
+    import crashinfo
+    crashinfo.setCrashReporterDescription(text)
+
+# implement this in some suitable way for your platform, and then bind it
+# to setCrashInfoHook
+def setCrashInfoHook_NonMac(text):
+    pass
+
+setCrashInfoHook = None
+
+def deleteCrashInfoDylib(dylib_path):
+    try:
+        # Need to modify this to handle multiple tests running at the same time.  If we move this
+        # to the test's real dir, all should be we run sequentially within a test directory.
+        # os.remove(dylib_path)
+        None
+    finally:
+        pass
+
+def setupCrashInfoHook():
+    global setCrashInfoHook
+    setCrashInfoHook = setCrashInfoHook_NonMac # safe default
+    if platform.system() == "Darwin":
+        import lock
+        test_dir = os.environ['LLDB_TEST']
+        if not test_dir or not os.path.exists(test_dir):
+            return
+        dylib_lock = os.path.join(test_dir,"crashinfo.lock")
+        dylib_src = os.path.join(test_dir,"crashinfo.c")
+        dylib_dst = os.path.join(test_dir,"crashinfo.so")
+        try:
+            compile_lock = lock.Lock(dylib_lock)
+            compile_lock.acquire()
+            if not os.path.isfile(dylib_dst) or os.path.getmtime(dylib_dst) < os.path.getmtime(dylib_src):
+                # we need to compile
+                cmd = "SDKROOT= xcrun clang %s -o %s -framework Python -Xlinker -dylib -iframework /System/Library/Frameworks/ -Xlinker -F /System/Library/Frameworks/" % (dylib_src,dylib_dst)
+                if subprocess.call(cmd,shell=True) != 0 or not os.path.isfile(dylib_dst):
+                    raise Exception('command failed: "{}"'.format(cmd))
+        finally:
+            compile_lock.release()
+            del compile_lock
+
+        setCrashInfoHook = setCrashInfoHook_Mac
+
+    else:
+        pass
+
+def shouldSkipBecauseOfCategories(test_categories):
+    global useCategories, categoriesList, skipCategories
+
+    if useCategories:
+        if len(test_categories) == 0 or len(categoriesList & set(test_categories)) == 0:
+            return True
+
+    for category in skipCategories:
+        if category in test_categories:
+            return True
+
+    return False
+
+def parseOptionsAndInitTestdirs():
+    """Initialize the list of directories containing our unittest scripts.
+
+    '-h/--help as the first option prints out usage info and exit the program.
+    """
+
+    global just_do_benchmarks_test
+    global dont_do_dsym_test
+    global dont_do_dwarf_test
+    global dont_do_dwo_test
+    global blacklist
+    global blacklistConfig
+    global categoriesList
+    global validCategories
+    global useCategories
+    global skipCategories
+    global lldbFrameworkPath
+    global configFile
+    global archs
+    global compilers
+    global count
+    global dumpSysPath
+    global bmExecutable
+    global bmBreakpointSpec
+    global bmIterationCount
+    global failfast
+    global filters
+    global fs4all
+    global ignore
+    global progress_bar
+    global runHooks
+    global skip_build_and_cleanup
+    global skip_long_running_test
+    global noHeaders
+    global parsable
+    global regexp
+    global rdir
+    global sdir_name
+    global svn_silent
+    global verbose
+    global testdirs
+    global lldb_platform_name
+    global lldb_platform_url
+    global lldb_platform_working_dir
+    global setCrashInfoHook
+    global is_inferior_test_runner
+    global multiprocess_test_subdir
+    global num_threads
+    global output_on_success
+    global no_multiprocess_test_runner
+    global test_runner_name
+    global results_filename
+    global results_formatter_name
+    global results_formatter_options
+    global results_port
+
+    do_help = False
+
+    platform_system = platform.system()
+    platform_machine = platform.machine()
+
+    parser = dotest_args.create_parser()
+    args = dotest_args.parse_args(parser, sys.argv[1:])
+
+    if args.unset_env_varnames:
+        for env_var in args.unset_env_varnames:
+            if env_var in os.environ:
+                # From Python Doc: When unsetenv() is supported, deletion of items in os.environ
+                # is automatically translated into a corresponding call to unsetenv().
+                del os.environ[env_var]
+                #os.unsetenv(env_var)
+
+    if args.set_env_vars:
+        for env_var in args.set_env_vars:
+            parts = env_var.split('=', 1)
+            if len(parts) == 1:
+                os.environ[parts[0]] = ""
+            else:
+                os.environ[parts[0]] = parts[1]
+
+    # only print the args if being verbose (and parsable is off)
+    if args.v and not args.q:
+        print(sys.argv)
+
+    if args.h:
+        do_help = True
+
+    if args.compilers:
+        compilers = args.compilers
+    else:
+        # Use a compiler appropriate appropriate for the Apple SDK if one was specified
+        if platform_system == 'Darwin' and args.apple_sdk:
+            compilers = [commands.getoutput('xcrun -sdk "%s" -find clang 2> /dev/null' % (args.apple_sdk))]
+        else:
+            # 'clang' on ubuntu 14.04 is 3.4 so we try clang-3.5 first
+            candidateCompilers = ['clang-3.5', 'clang', 'gcc']
+            for candidate in candidateCompilers:
+                if which(candidate):
+                    compilers = [candidate]
+                    break
+
+    if args.channels:
+        lldbtest_config.channels = args.channels
+
+    if args.log_success:
+        lldbtest_config.log_success = args.log_success
+
+    # Set SDKROOT if we are using an Apple SDK
+    if platform_system == 'Darwin' and args.apple_sdk:
+        os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk "%s" --show-sdk-path 2> /dev/null' % (args.apple_sdk))
+
+    if args.archs:
+        archs = args.archs
+        for arch in archs:
+            if arch.startswith('arm') and platform_system == 'Darwin' and not args.apple_sdk:
+                os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk iphoneos.internal --show-sdk-path 2> /dev/null')
+                if not os.path.exists(os.environ['SDKROOT']):
+                    os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk iphoneos --show-sdk-path 2> /dev/null')
+    else:
+        archs = [platform_machine]
+
+    if args.categoriesList:
+        categoriesList = set(test_categories.validate(args.categoriesList, False))
+        useCategories = True
+    else:
+        categoriesList = []
+
+    if args.skipCategories:
+        skipCategories = test_categories.validate(args.skipCategories, False)
+
+    if args.D:
+        dumpSysPath = True
+
+    if args.E:
+        cflags_extras = args.E
+        os.environ['CFLAGS_EXTRAS'] = cflags_extras
+
+    # argparse makes sure we have correct options
+    if args.N == 'dwarf':
+        dont_do_dwarf_test = True
+    elif args.N == 'dwo':
+        dont_do_dwo_test = True
+    elif args.N == 'dsym':
+        dont_do_dsym_test = True
+
+    if args.a or args.plus_a:
+        print("Options '-a' and '+a' have been deprecated. Please use the test category\n"
+              "functionality (-G pyapi, --skip-category pyapi) instead.")
+        sys.exit(1)
+
+    if args.m or args.plus_m:
+        print("Options '-m' and '+m' have been deprecated. Please use the test category\n"
+              "functionality (-G lldb-mi, --skip-category lldb-mi) instead.")
+        sys.exit(1)
+
+    if args.plus_b:
+        just_do_benchmarks_test = True
+
+    if args.b:
+        if args.b.startswith('-'):
+            usage(parser)
+        blacklistFile = args.b
+        if not os.path.isfile(blacklistFile):
+            print('Blacklist file:', blacklistFile, 'does not exist!')
+            usage(parser)
+        # Now read the blacklist contents and assign it to blacklist.
+        execfile(blacklistFile, globals(), blacklistConfig)
+        blacklist = blacklistConfig.get('blacklist')
+
+    if args.c:
+        if args.c.startswith('-'):
+            usage(parser)
+        configFile = args.c
+        if not os.path.isfile(configFile):
+            print('Config file:', configFile, 'does not exist!')
+            usage(parser)
+
+    if args.d:
+        sys.stdout.write("Suspending the process %d to wait for debugger to attach...\n" % os.getpid())
+        sys.stdout.flush()
+        os.kill(os.getpid(), signal.SIGSTOP)
+
+    if args.e:
+        if args.e.startswith('-'):
+            usage(parser)
+        bmExecutable = args.e
+        if not is_exe(bmExecutable):
+            usage(parser)
+
+    if args.F:
+        failfast = True
+
+    if args.f:
+        if any([x.startswith('-') for x in args.f]):
+            usage(parser)
+        filters.extend(args.f)
+        # Shut off multiprocessing mode when additional filters are specified.
+        # The rational is that the user is probably going after a very specific
+        # test and doesn't need a bunch of parallel test runners all looking for
+        # it in a frenzy.  Also, '-v' now spits out all test run output even
+        # on success, so the standard recipe for redoing a failing test (with -v
+        # and a -f to filter to the specific test) now causes all test scanning
+        # (in parallel) to print results for do-nothing runs in a very distracting
+        # manner.  If we really need filtered parallel runs in the future, consider
+        # adding a --no-output-on-success that prevents -v from setting
+        # output-on-success.
+        no_multiprocess_test_runner = True
+
+    if args.g:
+        fs4all = False
+
+    if args.i:
+        ignore = True
+
+    if args.k:
+        runHooks.extend(args.k)
+
+    if args.l:
+        skip_long_running_test = False
+
+    if args.framework:
+        lldbFrameworkPath = args.framework
+
+    if args.executable:
+        lldbtest_config.lldbExec = args.executable
+
+    if args.libcxx:
+        os.environ["LIBCXX_PATH"] = args.libcxx
+
+    if args.n:
+        noHeaders = True
+
+    if args.p:
+        if args.p.startswith('-'):
+            usage(parser)
+        regexp = args.p
+
+    if args.q:
+        noHeaders = True
+        parsable = True
+
+    if args.P and not args.v:
+        progress_bar = True
+        verbose = 0
+
+    if args.R:
+        if args.R.startswith('-'):
+            usage(parser)
+        rdir = os.path.abspath(args.R)
+        if os.path.exists(rdir):
+            import shutil
+            print('Removing tree:', rdir)
+            shutil.rmtree(rdir)
+
+    if args.r:
+        if args.r.startswith('-'):
+            usage(parser)
+        rdir = os.path.abspath(args.r)
+        if os.path.exists(rdir):
+            print('Relocated directory:', rdir, 'must not exist!')
+            usage(parser)
+
+    if args.S:
+        skip_build_and_cleanup = True
+
+    if args.s:
+        if args.s.startswith('-'):
+            usage(parser)
+        sdir_name = args.s
+
+    if args.t:
+        os.environ['LLDB_COMMAND_TRACE'] = 'YES'
+
+    if args.T:
+        svn_silent = False
+
+    if args.v:
+        verbose = 2
+
+    if args.w:
+        os.environ['LLDB_WAIT_BETWEEN_TEST_CASES'] = 'YES'
+
+    if args.X:
+        if args.X.startswith('-'):
+            usage(parser)
+        excluded.add(args.X)
+
+    if args.x:
+        if args.x.startswith('-'):
+            usage(parser)
+        bmBreakpointSpec = args.x
+
+    # argparse makes sure we have a number
+    if args.y:
+        bmIterationCount = args.y
+
+    # argparse makes sure we have a number
+    if args.sharp:
+        count = args.sharp
+
+    if sys.platform.startswith('win32'):
+        os.environ['LLDB_DISABLE_CRASH_DIALOG'] = str(args.disable_crash_dialog)
+        os.environ['LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE'] = str(args.hide_inferior_console)
+
+    if do_help == True:
+        usage(parser)
+
+    if args.no_multiprocess:
+        no_multiprocess_test_runner = True
+
+    if args.inferior:
+        is_inferior_test_runner = True
+
+    # Turn on output_on_sucess if either explicitly added or -v specified.
+    if args.output_on_success or args.v:
+        output_on_success = True
+
+    if args.num_threads:
+        num_threads = args.num_threads
+
+    if args.test_subdir:
+        multiprocess_test_subdir = args.test_subdir
+
+    if args.test_runner_name:
+        test_runner_name = args.test_runner_name
+
+    # Capture test results-related args.
+    if args.results_file:
+        results_filename = args.results_file
+
+    if args.results_port:
+        results_port = args.results_port
+
+    if args.results_file and args.results_port:
+        sys.stderr.write(
+            "only one of --results-file and --results-port should "
+            "be specified\n")
+        usage(args)
+
+    if args.results_formatter:
+        results_formatter_name = args.results_formatter
+    if args.results_formatter_options:
+        results_formatter_options = args.results_formatter_options
+
+    if args.lldb_platform_name:
+        lldb_platform_name = args.lldb_platform_name
+    if args.lldb_platform_url:
+        lldb_platform_url = args.lldb_platform_url
+    if args.lldb_platform_working_dir:
+        lldb_platform_working_dir = args.lldb_platform_working_dir
+
+    if args.event_add_entries and len(args.event_add_entries) > 0:
+        entries = {}
+        # Parse out key=val pairs, separated by comma
+        for keyval in args.event_add_entries.split(","):
+            key_val_entry = keyval.split("=")
+            if len(key_val_entry) == 2:
+                (key, val) = key_val_entry
+                val_parts = val.split(':')
+                if len(val_parts) > 1:
+                    (val, val_type) = val_parts
+                    if val_type == 'int':
+                        val = int(val)
+                entries[key] = val
+        # Tell the event builder to create all events with these
+        # key/val pairs in them.
+        if len(entries) > 0:
+            test_results.EventBuilder.add_entries_to_all_events(entries)
+
+    # Gather all the dirs passed on the command line.
+    if len(args.args) > 0:
+        testdirs = list(map(os.path.abspath, args.args))
+        # Shut off multiprocessing mode when test directories are specified.
+        no_multiprocess_test_runner = True
+
+    # If '-r dir' is specified, the tests should be run under the relocated
+    # directory.  Let's copy the testdirs over.
+    if rdir:
+        from shutil import copytree, ignore_patterns
+
+        tmpdirs = []
+        orig_testdirs = testdirs[:]
+        for srcdir in testdirs:
+            # For example, /Volumes/data/lldb/svn/ToT/test/functionalities/watchpoint/hello_watchpoint
+            # shall be split into ['/Volumes/data/lldb/svn/ToT/', 'functionalities/watchpoint/hello_watchpoint'].
+            # Utilize the relative path to the 'test' directory to make our destination dir path.
+            if ("test" + os.sep) in srcdir:
+                to_split_on = "test" + os.sep
+            else:
+                to_split_on = "test"
+            dstdir = os.path.join(rdir, srcdir.split(to_split_on)[1])
+            dstdir = dstdir.rstrip(os.sep)
+            # Don't copy the *.pyc and .svn stuffs.
+            copytree(srcdir, dstdir, ignore=ignore_patterns('*.pyc', '.svn'))
+            tmpdirs.append(dstdir)
+
+        # This will be our modified testdirs.
+        testdirs = tmpdirs
+
+        # With '-r dir' specified, there's no cleanup of intermediate test files.
+        os.environ["LLDB_DO_CLEANUP"] = 'NO'
+
+        # If the original testdirs is ['test'], the make directory has already been copied
+        # recursively and is contained within the rdir/test dir.  For anything
+        # else, we would need to copy over the make directory and its contents,
+        # so that, os.listdir(rdir) looks like, for example:
+        #
+        #     array_types conditional_break make
+        #
+        # where the make directory contains the Makefile.rules file.
+        if len(testdirs) != 1 or os.path.basename(orig_testdirs[0]) != 'test':
+            scriptdir = os.path.dirname(__file__)
+            # Don't copy the .svn stuffs.
+            copytree(os.path.join(scriptdir, 'make'), os.path.join(rdir, 'make'),
+                     ignore=ignore_patterns('.svn'))
+
+    #print("testdirs:", testdirs)
+
+    # Source the configFile if specified.
+    # The side effect, if any, will be felt from this point on.  An example
+    # config file may be these simple two lines:
+    #
+    # sys.stderr = open("/tmp/lldbtest-stderr", "w")
+    # sys.stdout = open("/tmp/lldbtest-stdout", "w")
+    #
+    # which will reassign the two file objects to sys.stderr and sys.stdout,
+    # respectively.
+    #
+    # See also lldb-trunk/examples/test/usage-config.
+    global config, pre_flight, post_flight, lldbtest_remote_sandbox, lldbtest_remote_shell_template
+    if configFile:
+        # Pass config (a dictionary) as the locals namespace for side-effect.
+        execfile(configFile, globals(), config)
+        #print("config:", config)
+        if "pre_flight" in config:
+            pre_flight = config["pre_flight"]
+            if not six.callable(pre_flight):
+                print("fatal error: pre_flight is not callable, exiting.")
+                sys.exit(1)
+        if "post_flight" in config:
+            post_flight = config["post_flight"]
+            if not six.callable(post_flight):
+                print("fatal error: post_flight is not callable, exiting.")
+                sys.exit(1)
+        if "lldbtest_remote_sandbox" in config:
+            lldbtest_remote_sandbox = config["lldbtest_remote_sandbox"]
+        if "lldbtest_remote_shell_template" in config:
+            lldbtest_remote_shell_template = config["lldbtest_remote_shell_template"]
+        #print("sys.stderr:", sys.stderr)
+        #print("sys.stdout:", sys.stdout)
+
+def getXcodeOutputPaths(lldbRootDirectory):
+    result = []
+
+    # These are for xcode build directories.
+    xcode3_build_dir = ['build']
+    xcode4_build_dir = ['build', 'lldb', 'Build', 'Products']
+
+    configurations = [['Debug'], ['DebugClang'], ['Release'], ['BuildAndIntegration']]
+    xcode_build_dirs = [xcode3_build_dir, xcode4_build_dir]
+    for configuration in configurations:
+        for xcode_build_dir in xcode_build_dirs:
+            outputPath = os.path.join(lldbRootDirectory, *(xcode_build_dir+configuration) )
+            result.append(outputPath)
+
+    return result
+
+
+def createSocketToLocalPort(port):
+    def socket_closer(s):
+        """Close down an opened socket properly."""
+        s.shutdown(socket.SHUT_RDWR)
+        s.close()
+
+    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    sock.connect(("localhost", port))
+    return (sock, lambda: socket_closer(sock))
+
+
+def setupTestResults():
+    """Sets up test results-related objects based on arg settings."""
+    global results_filename
+    global results_file_object
+    global results_formatter_name
+    global results_formatter_object
+    global results_formatter_options
+    global results_port
+
+    default_formatter_name = None
+    cleanup_func = None
+
+    if results_filename:
+        # Open the results file for writing.
+        if results_filename == 'stdout':
+            results_file_object = sys.stdout
+            cleanup_func = None
+        elif results_filename == 'stderr':
+            results_file_object = sys.stderr
+            cleanup_func = None
+        else:
+            results_file_object = open(results_filename, "w")
+            cleanup_func = results_file_object.close
+        default_formatter_name = "test_results.XunitFormatter"
+    elif results_port:
+        # Connect to the specified localhost port.
+        results_file_object, cleanup_func = createSocketToLocalPort(
+            results_port)
+        default_formatter_name = "test_results.RawPickledFormatter"
+
+    if results_file_object:
+        # We care about the formatter.  Choose user-specified or, if
+        # none specified, use the default for the output type.
+        if results_formatter_name:
+            formatter_name = results_formatter_name
+        else:
+            formatter_name = default_formatter_name
+
+        # Create an instance of the class.  First figure out the package/module.
+        components = formatter_name.split(".")
+        module = importlib.import_module(".".join(components[:-1]))
+
+        # Create the class name we need to load.
+        clazz = getattr(module, components[-1])
+
+        # Handle formatter options for the results formatter class.
+        formatter_arg_parser = clazz.arg_parser()
+        if results_formatter_options and len(results_formatter_options) > 0:
+            command_line_options = results_formatter_options
+        else:
+            command_line_options = []
+
+        formatter_options = formatter_arg_parser.parse_args(
+            command_line_options)
+
+        # Create the TestResultsFormatter given the processed options.
+        results_formatter_object = clazz(results_file_object, formatter_options)
+
+        # Start the results formatter session - we'll only have one
+        # during a given dotest process invocation.
+        initialize_event = EventBuilder.bare_event("initialize")
+        if isMultiprocessTestRunner():
+            if test_runner_name is not None and test_runner_name == "serial":
+                # Only one worker queue here.
+                worker_count = 1
+            else:
+                # Workers will be the number of threads specified.
+                worker_count = num_threads
+        else:
+            worker_count = 1
+        initialize_event["worker_count"] = worker_count
+
+        results_formatter_object.handle_event(initialize_event)
+
+        def shutdown_formatter():
+            # Tell the formatter to write out anything it may have
+            # been saving until the very end (e.g. xUnit results
+            # can't complete its output until this point).
+            results_formatter_object.send_terminate_as_needed()
+
+            # And now close out the output file-like object.
+            if cleanup_func is not None:
+                cleanup_func()
+
+        atexit.register(shutdown_formatter)
+
+
+def getOutputPaths(lldbRootDirectory):
+    """
+    Returns typical build output paths for the lldb executable
+
+    lldbDirectory - path to the root of the lldb svn/git repo
+    """
+    result = []
+
+    if sys.platform == 'darwin':
+        result.extend(getXcodeOutputPaths(lldbRootDirectory))
+
+    # cmake builds?  look for build or build/host folder next to llvm directory
+    # lldb is located in llvm/tools/lldb so we need to go up three levels
+    llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir))
+    result.append(os.path.join(llvmParentDir, 'build', 'bin'))
+    result.append(os.path.join(llvmParentDir, 'build', 'host', 'bin'))
+
+    # some cmake developers keep their build directory beside their lldb directory
+    lldbParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir))
+    result.append(os.path.join(lldbParentDir, 'build', 'bin'))
+    result.append(os.path.join(lldbParentDir, 'build', 'host', 'bin'))
+
+    return result
+
+def setupSysPath():
+    """
+    Add LLDB.framework/Resources/Python to the search paths for modules.
+    As a side effect, we also discover the 'lldb' executable and export it here.
+    """
+
+    global rdir
+    global testdirs
+    global dumpSysPath
+    global noHeaders
+    global svn_info
+    global svn_silent
+    global lldbFrameworkPath
+
+    # Get the directory containing the current script.
+    if "DOTEST_PROFILE" in os.environ and "DOTEST_SCRIPT_DIR" in os.environ:
+        scriptPath = os.environ["DOTEST_SCRIPT_DIR"]
+    else:
+        scriptPath = os.path.dirname(os.path.realpath(__file__))
+    if not scriptPath.endswith('test'):
+        print("This script expects to reside in lldb's test directory.")
+        sys.exit(-1)
+
+    if rdir:
+        # Set up the LLDB_TEST environment variable appropriately, so that the
+        # individual tests can be located relatively.
+        #
+        # See also lldbtest.TestBase.setUpClass(cls).
+        if len(testdirs) == 1 and os.path.basename(testdirs[0]) == 'test':
+            os.environ["LLDB_TEST"] = os.path.join(rdir, 'test')
+        else:
+            os.environ["LLDB_TEST"] = rdir
+    else:
+        os.environ["LLDB_TEST"] = scriptPath
+
+    # Set up the LLDB_SRC environment variable, so that the tests can locate
+    # the LLDB source code.
+    os.environ["LLDB_SRC"] = lldbsuite.lldb_root
+
+    pluginPath = os.path.join(scriptPath, 'plugins')
+    toolsLLDBMIPath = os.path.join(scriptPath, 'tools', 'lldb-mi')
+    toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server')
+
+    # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to the sys.path.
+    sys.path.insert(0, scriptPath)
+    sys.path.insert(0, pluginPath)
+    sys.path.insert(0, toolsLLDBMIPath)      # Adding test/tools/lldb-mi to the path makes it easy
+                                             # to "import lldbmi_testcase" from the MI tests
+    sys.path.insert(0, toolsLLDBServerPath)  # Adding test/tools/lldb-server to the path makes it easy
+                                             # to "import lldbgdbserverutils" from the lldb-server tests
+
+    # This is the root of the lldb git/svn checkout
+    # When this changes over to a package instead of a standalone script, this
+    # will be `lldbsuite.lldb_root`
+    lldbRootDirectory = lldbsuite.lldb_root
+
+    # Some of the tests can invoke the 'lldb' command directly.
+    # We'll try to locate the appropriate executable right here.
+
+    # The lldb executable can be set from the command line
+    # if it's not set, we try to find it now
+    # first, we try the environment
+    if not lldbtest_config.lldbExec:
+        # First, you can define an environment variable LLDB_EXEC specifying the
+        # full pathname of the lldb executable.
+        if "LLDB_EXEC" in os.environ:
+            lldbtest_config.lldbExec = os.environ["LLDB_EXEC"]
+
+    if not lldbtest_config.lldbExec:
+        outputPaths = getOutputPaths(lldbRootDirectory)
+        for outputPath in outputPaths:
+            candidatePath = os.path.join(outputPath, 'lldb')
+            if is_exe(candidatePath):
+                lldbtest_config.lldbExec = candidatePath
+                break
+
+    if not lldbtest_config.lldbExec:
+        # Last, check the path
+        lldbtest_config.lldbExec = which('lldb')
+
+    if lldbtest_config.lldbExec and not is_exe(lldbtest_config.lldbExec):
+        print("'{}' is not a path to a valid executable".format(lldbtest_config.lldbExec))
+        lldbtest_config.lldbExec = None
+
+    if not lldbtest_config.lldbExec:
+        print("The 'lldb' executable cannot be located.  Some of the tests may not be run as a result.")
+        sys.exit(-1)
+
+    lldbLibDir = os.path.dirname(lldbtest_config.lldbExec)  # confusingly, this is the "bin" directory
+    os.environ["LLDB_LIB_DIR"] = lldbLibDir
+    lldbImpLibDir = os.path.join(lldbLibDir, '..', 'lib') if sys.platform.startswith('win32') else lldbLibDir
+    os.environ["LLDB_IMPLIB_DIR"] = lldbImpLibDir
+    if not noHeaders:
+        print("LLDB library dir:", os.environ["LLDB_LIB_DIR"])
+        print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"])
+        os.system('%s -v' % lldbtest_config.lldbExec)
+
+    # Assume lldb-mi is in same place as lldb
+    # If not found, disable the lldb-mi tests
+    lldbMiExec = None
+    if lldbtest_config.lldbExec and is_exe(lldbtest_config.lldbExec + "-mi"):
+        lldbMiExec = lldbtest_config.lldbExec + "-mi"
+    if not lldbMiExec:
+        if not shouldSkipBecauseOfCategories(["lldb-mi"]):
+            print("The 'lldb-mi' executable cannot be located.  The lldb-mi tests can not be run as a result.")
+            skipCategories.append("lldb-mi")
+    else:
+        os.environ["LLDBMI_EXEC"] = lldbMiExec
+
+    # Skip printing svn/git information when running in parsable (lit-test compatibility) mode
+    if not svn_silent and not parsable:
+        if os.path.isdir(os.path.join(lldbRootDirectory, '.svn')) and which("svn") is not None:
+            pipe = subprocess.Popen([which("svn"), "info", lldbRootDirectory], stdout = subprocess.PIPE)
+            svn_info = pipe.stdout.read()
+        elif os.path.isdir(os.path.join(lldbRootDirectory, '.git')) and which("git") is not None:
+            pipe = subprocess.Popen([which("git"), "svn", "info", lldbRootDirectory], stdout = subprocess.PIPE)
+            svn_info = pipe.stdout.read()
+        if not noHeaders:
+            print(svn_info)
+
+    global ignore
+
+    lldbPythonDir = None # The directory that contains 'lldb/__init__.py'
+    if lldbFrameworkPath:
+        candidatePath = os.path.join(lldbFrameworkPath, 'Resources', 'Python')
+        if os.path.isfile(os.path.join(candidatePath, 'lldb/__init__.py')):
+            lldbPythonDir = candidatePath
+        if not lldbPythonDir:
+            print('Resources/Python/lldb/__init__.py was not found in ' + lldbFrameworkPath)
+            sys.exit(-1)
+    else:
+        # The '-i' option is used to skip looking for lldb.py in the build tree.
+        if ignore:
+            return
+        
+        # If our lldb supports the -P option, use it to find the python path:
+        init_in_python_dir = os.path.join('lldb', '__init__.py')
+
+        lldb_dash_p_result = subprocess.check_output([lldbtest_config.lldbExec, "-P"], stderr=subprocess.STDOUT)
+
+        if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")) \
+							  and not lldb_dash_p_result.startswith("Traceback"):
+            lines = lldb_dash_p_result.splitlines()
+
+            # Workaround for readline vs libedit issue on FreeBSD.  If stdout
+            # is not a terminal Python executes
+            #     rl_variable_bind ("enable-meta-key", "off");
+            # This produces a warning with FreeBSD's libedit because the
+            # enable-meta-key variable is unknown.  Not an issue on Apple
+            # because cpython commit f0ab6f9f0603 added a #ifndef __APPLE__
+            # around the call.  See http://bugs.python.org/issue19884 for more
+            # information.  For now we just discard the warning output.
+            if len(lines) >= 1 and lines[0].startswith("bind: Invalid command"):
+                lines.pop(0)
+
+            # Taking the last line because lldb outputs
+            # 'Cannot read termcap database;\nusing dumb terminal settings.\n'
+            # before the path
+            if len(lines) >= 1 and os.path.isfile(os.path.join(lines[-1], init_in_python_dir)):
+                lldbPythonDir = lines[-1]
+                if "freebsd" in sys.platform or "linux" in sys.platform:
+                    os.environ['LLDB_LIB_DIR'] = os.path.join(lldbPythonDir, '..', '..')
+        
+        if not lldbPythonDir:
+            if platform.system() == "Darwin":
+                python_resource_dir = ['LLDB.framework', 'Resources', 'Python']
+                outputPaths = getXcodeOutputPaths()
+                for outputPath in outputPaths:
+                    candidatePath = os.path.join(outputPath, python_resource_dir)
+                    if os.path.isfile(os.path.join(candidatePath, init_in_python_dir)):
+                        lldbPythonDir = candidatePath
+                        break
+
+                if not lldbPythonDir:
+                    print('This script requires lldb.py to be in either ' + dbgPath + ',', end=' ')
+                    print(relPath + ', or ' + baiPath + '. Some tests might fail.')
+            else:
+                print("Unable to load lldb extension module.  Possible reasons for this include:")
+                print("  1) LLDB was built with LLDB_DISABLE_PYTHON=1")
+                print("  2) PYTHONPATH and PYTHONHOME are not set correctly.  PYTHONHOME should refer to")
+                print("     the version of Python that LLDB built and linked against, and PYTHONPATH")
+                print("     should contain the Lib directory for the same python distro, as well as the")
+                print("     location of LLDB\'s site-packages folder.")
+                print("  3) A different version of Python than that which was built against is exported in")
+                print("     the system\'s PATH environment variable, causing conflicts.")
+                print("  4) The executable '%s' could not be found.  Please check " % lldbExecutable)
+                print("     that it exists and is executable.")
+
+    if lldbPythonDir:
+        lldbPythonDir = os.path.normpath(lldbPythonDir)
+        # Some of the code that uses this path assumes it hasn't resolved the Versions... link.  
+        # If the path we've constructed looks like that, then we'll strip out the Versions/A part.
+        (before, frameWithVersion, after) = lldbPythonDir.rpartition("LLDB.framework/Versions/A")
+        if frameWithVersion != "" :
+            lldbPythonDir = before + "LLDB.framework" + after
+
+        lldbPythonDir = os.path.abspath(lldbPythonDir)
+
+        # If tests need to find LLDB_FRAMEWORK, now they can do it
+        os.environ["LLDB_FRAMEWORK"] = os.path.dirname(os.path.dirname(lldbPythonDir))
+
+        # This is to locate the lldb.py module.  Insert it right after sys.path[0].
+        sys.path[1:1] = [lldbPythonDir]
+        if dumpSysPath:
+            print("sys.path:", sys.path)
+
+def visit(prefix, dir, names):
+    """Visitor function for os.path.walk(path, visit, arg)."""
+
+    global suite
+    global regexp
+    global filters
+    global fs4all
+    global excluded
+    global all_tests
+
+    if set(dir.split(os.sep)).intersection(excluded):
+        #print("Detected an excluded dir component: %s" % dir)
+        return
+
+    for name in names:
+        if os.path.isdir(os.path.join(dir, name)):
+            continue
+
+        if '.py' == os.path.splitext(name)[1] and name.startswith(prefix):
+
+            if name in all_tests:
+                raise Exception("Found multiple tests with the name %s" % name)
+            all_tests.add(name)
+
+            # Try to match the regexp pattern, if specified.
+            if regexp:
+                import re
+                if re.search(regexp, name):
+                    #print("Filename: '%s' matches pattern: '%s'" % (name, regexp))
+                    pass
+                else:
+                    #print("Filename: '%s' does not match pattern: '%s'" % (name, regexp))
+                    continue
+
+            # We found a match for our test.  Add it to the suite.
+
+            # Update the sys.path first.
+            if not sys.path.count(dir):
+                sys.path.insert(0, dir)
+            base = os.path.splitext(name)[0]
+
+            # Thoroughly check the filterspec against the base module and admit
+            # the (base, filterspec) combination only when it makes sense.
+            filterspec = None
+            for filterspec in filters:
+                # Optimistically set the flag to True.
+                filtered = True
+                module = __import__(base)
+                parts = filterspec.split('.')
+                obj = module
+                for part in parts:
+                    try:
+                        parent, obj = obj, getattr(obj, part)
+                    except AttributeError:
+                        # The filterspec has failed.
+                        filtered = False
+                        break
+
+                # If filtered, we have a good filterspec.  Add it.
+                if filtered:
+                    #print("adding filter spec %s to module %s" % (filterspec, module))
+                    suite.addTests(
+                        unittest2.defaultTestLoader.loadTestsFromName(filterspec, module))
+                    continue
+
+            # Forgo this module if the (base, filterspec) combo is invalid
+            # and no '-g' option is specified
+            if filters and fs4all and not filtered:
+                continue
+
+            # Add either the filtered test case(s) (which is done before) or the entire test class.
+            if not filterspec or not filtered:
+                # A simple case of just the module name.  Also the failover case
+                # from the filterspec branch when the (base, filterspec) combo
+                # doesn't make sense.
+                suite.addTests(unittest2.defaultTestLoader.loadTestsFromName(base))
+
+
+def disabledynamics():
+    import lldb
+    ci = lldb.DBG.GetCommandInterpreter()
+    res = lldb.SBCommandReturnObject()
+    ci.HandleCommand("setting set target.prefer-dynamic-value no-dynamic-values", res, False)    
+    if not res.Succeeded():
+        raise Exception('disabling dynamic type support failed')
+
+def lldbLoggings():
+    import lldb
+    """Check and do lldb loggings if necessary."""
+
+    # Turn on logging for debugging purposes if ${LLDB_LOG} environment variable is
+    # defined.  Use ${LLDB_LOG} to specify the log file.
+    ci = lldb.DBG.GetCommandInterpreter()
+    res = lldb.SBCommandReturnObject()
+    if ("LLDB_LOG" in os.environ):
+        open(os.environ["LLDB_LOG"], 'w').close()
+        if ("LLDB_LOG_OPTION" in os.environ):
+            lldb_log_option = os.environ["LLDB_LOG_OPTION"]
+        else:
+            lldb_log_option = "event process expr state api"
+        ci.HandleCommand(
+            "log enable -n -f " + os.environ["LLDB_LOG"] + " lldb " + lldb_log_option,
+            res)
+        if not res.Succeeded():
+            raise Exception('log enable failed (check LLDB_LOG env variable)')
+
+    if ("LLDB_LINUX_LOG" in os.environ):
+        open(os.environ["LLDB_LINUX_LOG"], 'w').close()
+        if ("LLDB_LINUX_LOG_OPTION" in os.environ):
+            lldb_log_option = os.environ["LLDB_LINUX_LOG_OPTION"]
+        else:
+            lldb_log_option = "event process expr state api"
+        ci.HandleCommand(
+            "log enable -n -f " + os.environ["LLDB_LINUX_LOG"] + " linux " + lldb_log_option,
+            res)
+        if not res.Succeeded():
+            raise Exception('log enable failed (check LLDB_LINUX_LOG env variable)')
+ 
+    # Ditto for gdb-remote logging if ${GDB_REMOTE_LOG} environment variable is defined.
+    # Use ${GDB_REMOTE_LOG} to specify the log file.
+    if ("GDB_REMOTE_LOG" in os.environ):
+        if ("GDB_REMOTE_LOG_OPTION" in os.environ):
+            gdb_remote_log_option = os.environ["GDB_REMOTE_LOG_OPTION"]
+        else:
+            gdb_remote_log_option = "packets process"
+        ci.HandleCommand(
+            "log enable -n -f " + os.environ["GDB_REMOTE_LOG"] + " gdb-remote "
+            + gdb_remote_log_option,
+            res)
+        if not res.Succeeded():
+            raise Exception('log enable failed (check GDB_REMOTE_LOG env variable)')
+
+def getMyCommandLine():
+    return ' '.join(sys.argv)
+
+# ======================================== #
+#                                          #
+# Execution of the test driver starts here #
+#                                          #
+# ======================================== #
+
+def checkDsymForUUIDIsNotOn():
+    cmd = ["defaults", "read", "com.apple.DebugSymbols"]
+    pipe = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+    cmd_output = pipe.stdout.read()
+    if cmd_output and "DBGFileMappedPaths = " in cmd_output:
+        print("%s =>" % ' '.join(cmd))
+        print(cmd_output)
+        print("Disable automatic lookup and caching of dSYMs before running the test suite!")
+        print("Exiting...")
+        sys.exit(0)
+
+def exitTestSuite(exitCode = None):
+    import lldb
+    lldb.SBDebugger.Terminate()
+    if exitCode:
+        sys.exit(exitCode)
+
+
+def isMultiprocessTestRunner():
+    # We're not multiprocess when we're either explicitly
+    # the inferior (as specified by the multiprocess test
+    # runner) OR we've been told to skip using the multiprocess
+    # test runner
+    return not (is_inferior_test_runner or no_multiprocess_test_runner)
+
+def run_suite():
+    global just_do_benchmarks_test
+    global dont_do_dsym_test
+    global dont_do_dwarf_test
+    global dont_do_dwo_test
+    global blacklist
+    global blacklistConfig
+    global categoriesList
+    global validCategories
+    global useCategories
+    global skipCategories
+    global lldbFrameworkPath
+    global configFile
+    global archs
+    global compilers
+    global count
+    global dumpSysPath
+    global bmExecutable
+    global bmBreakpointSpec
+    global bmIterationCount
+    global failed
+    global failfast
+    global filters
+    global fs4all
+    global ignore
+    global progress_bar
+    global runHooks
+    global skip_build_and_cleanup
+    global skip_long_running_test
+    global noHeaders
+    global parsable
+    global regexp
+    global rdir
+    global sdir_name
+    global svn_silent
+    global verbose
+    global testdirs
+    global lldb_platform_name
+    global lldb_platform_url
+    global lldb_platform_working_dir
+    global setCrashInfoHook
+    global is_inferior_test_runner
+    global multiprocess_test_subdir
+    global num_threads
+    global output_on_success
+    global no_multiprocess_test_runner
+    global test_runner_name
+    global results_filename
+    global results_formatter_name
+    global results_formatter_options
+    global results_port
+
+    # On MacOS X, check to make sure that domain for com.apple.DebugSymbols defaults
+    # does not exist before proceeding to running the test suite.
+    if sys.platform.startswith("darwin"):
+        checkDsymForUUIDIsNotOn()
+
+    #
+    # Start the actions by first parsing the options while setting up the test
+    # directories, followed by setting up the search paths for lldb utilities;
+    # then, we walk the directory trees and collect the tests into our test suite.
+    #
+    parseOptionsAndInitTestdirs()
+
+    # Setup test results (test results formatter and output handling).
+    setupTestResults()
+
+    # If we are running as the multiprocess test runner, kick off the
+    # multiprocess test runner here.
+    if isMultiprocessTestRunner():
+        import dosep
+        dosep.main(output_on_success, num_threads, multiprocess_test_subdir,
+                   test_runner_name, results_formatter_object)
+        raise Exception("should never get here")
+    elif is_inferior_test_runner:
+        # Shut off Ctrl-C processing in inferiors.  The parallel
+        # test runner handles this more holistically.
+        signal.signal(signal.SIGINT, signal.SIG_IGN)
+
+    setupSysPath()
+    setupCrashInfoHook()
+
+    #
+    # If '-l' is specified, do not skip the long running tests.
+    if not skip_long_running_test:
+        os.environ["LLDB_SKIP_LONG_RUNNING_TEST"] = "NO"
+
+    # For the time being, let's bracket the test runner within the
+    # lldb.SBDebugger.Initialize()/Terminate() pair.
+    import lldb
+
+    # Create a singleton SBDebugger in the lldb namespace.
+    lldb.DBG = lldb.SBDebugger.Create()
+
+    if lldb_platform_name:
+        print("Setting up remote platform '%s'" % (lldb_platform_name))
+        lldb.remote_platform = lldb.SBPlatform(lldb_platform_name)
+        if not lldb.remote_platform.IsValid():
+            print("error: unable to create the LLDB platform named '%s'." % (lldb_platform_name))
+            exitTestSuite(1)
+        if lldb_platform_url:
+            # We must connect to a remote platform if a LLDB platform URL was specified
+            print("Connecting to remote platform '%s' at '%s'..." % (lldb_platform_name, lldb_platform_url))
+            lldb.platform_url = lldb_platform_url
+            platform_connect_options = lldb.SBPlatformConnectOptions(lldb_platform_url)
+            err = lldb.remote_platform.ConnectRemote(platform_connect_options)
+            if err.Success():
+                print("Connected.")
+            else:
+                print("error: failed to connect to remote platform using URL '%s': %s" % (lldb_platform_url, err))
+                exitTestSuite(1)
+        else:
+            lldb.platform_url = None
+
+        if lldb_platform_working_dir:
+            print("Setting remote platform working directory to '%s'..." % (lldb_platform_working_dir))
+            lldb.remote_platform.SetWorkingDirectory(lldb_platform_working_dir)
+    
+        lldb.remote_platform_working_dir = lldb_platform_working_dir
+        lldb.DBG.SetSelectedPlatform(lldb.remote_platform)
+    else:
+        lldb.remote_platform = None
+        lldb.remote_platform_working_dir = None
+        lldb.platform_url = None
+
+    target_platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
+
+    # By default, both dsym, dwarf and dwo tests are performed.
+    # Use @dsym_test, @dwarf_test or @dwo_test decorators, defined in lldbtest.py, to mark a test as
+    # a dsym, dwarf or dwo test.  Use '-N dsym', '-N dwarf' or '-N dwo' to exclude dsym, dwarf or
+    # dwo tests from running.
+    dont_do_dsym_test = dont_do_dsym_test or any(platform in target_platform for platform in ["linux", "freebsd", "windows"])
+    dont_do_dwo_test = dont_do_dwo_test or any(platform in target_platform for platform in ["darwin", "macosx", "ios"])
+
+    # Don't do debugserver tests on everything except OS X.
+    dont_do_debugserver_test = "linux" in target_platform or "freebsd" in target_platform or "windows" in target_platform
+
+    # Don't do lldb-server (llgs) tests on anything except Linux.
+    dont_do_llgs_test = not ("linux" in target_platform)
+
+    #
+    # Walk through the testdirs while collecting tests.
+    #
+    for testdir in testdirs:
+        os.path.walk(testdir, visit, 'Test')
+
+    #
+    # Now that we have loaded all the test cases, run the whole test suite.
+    #
+
+    # Put the blacklist in the lldb namespace, to be used by lldb.TestBase.
+    lldb.blacklist = blacklist
+
+    # The pre_flight and post_flight come from reading a config file.
+    lldb.pre_flight = pre_flight
+    lldb.post_flight = post_flight
+    def getsource_if_available(obj):
+        """
+        Return the text of the source code for an object if available.  Otherwise,
+        a print representation is returned.
+        """
+        import inspect
+        try:
+            return inspect.getsource(obj)
+        except:
+            return repr(obj)
+
+    if not noHeaders:
+        print("lldb.pre_flight:", getsource_if_available(lldb.pre_flight))
+        print("lldb.post_flight:", getsource_if_available(lldb.post_flight))
+
+    # If either pre_flight or post_flight is defined, set lldb.test_remote to True.
+    if lldb.pre_flight or lldb.post_flight:
+        lldb.test_remote = True
+    else:
+        lldb.test_remote = False
+
+    # So do the lldbtest_remote_sandbox and lldbtest_remote_shell_template variables.
+    lldb.lldbtest_remote_sandbox = lldbtest_remote_sandbox
+    lldb.lldbtest_remote_sandboxed_executable = None
+    lldb.lldbtest_remote_shell_template = lldbtest_remote_shell_template
+
+    # Put all these test decorators in the lldb namespace.
+    lldb.just_do_benchmarks_test = just_do_benchmarks_test
+    lldb.dont_do_dsym_test = dont_do_dsym_test
+    lldb.dont_do_dwarf_test = dont_do_dwarf_test
+    lldb.dont_do_dwo_test = dont_do_dwo_test
+    lldb.dont_do_debugserver_test = dont_do_debugserver_test
+    lldb.dont_do_llgs_test = dont_do_llgs_test
+
+    # Do we need to skip build and cleanup?
+    lldb.skip_build_and_cleanup = skip_build_and_cleanup
+
+    # Put bmExecutable, bmBreakpointSpec, and bmIterationCount into the lldb namespace, too.
+    lldb.bmExecutable = bmExecutable
+    lldb.bmBreakpointSpec = bmBreakpointSpec
+    lldb.bmIterationCount = bmIterationCount
+
+    # And don't forget the runHooks!
+    lldb.runHooks = runHooks
+
+    # Turn on lldb loggings if necessary.
+    lldbLoggings()
+
+    # Disable default dynamic types for testing purposes
+    disabledynamics()
+
+    # Install the control-c handler.
+    unittest2.signals.installHandler()
+
+    # If sdir_name is not specified through the '-s sdir_name' option, get a
+    # timestamp string and export it as LLDB_SESSION_DIR environment var.  This will
+    # be used when/if we want to dump the session info of individual test cases
+    # later on.
+    #
+    # See also TestBase.dumpSessionInfo() in lldbtest.py.
+    import datetime
+    # The windows platforms don't like ':' in the pathname.
+    timestamp_started = datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S")
+    if not sdir_name:
+        sdir_name = timestamp_started
+    os.environ["LLDB_SESSION_DIRNAME"] = os.path.join(os.getcwd(), sdir_name)
+
+    if not noHeaders:
+        sys.stderr.write("\nSession logs for test failures/errors/unexpected successes"
+                         " will go into directory '%s'\n" % sdir_name)
+        sys.stderr.write("Command invoked: %s\n" % getMyCommandLine())
+
+    if not os.path.isdir(sdir_name):
+        try:
+            os.mkdir(sdir_name)
+        except OSError as exception:
+            if exception.errno != errno.EEXIST:
+                raise
+    where_to_save_session = os.getcwd()
+    fname = os.path.join(sdir_name, "TestStarted-%d" % os.getpid())
+    with open(fname, "w") as f:
+        print("Test started at: %s\n" % timestamp_started, file=f)
+        print(svn_info, file=f)
+        print("Command invoked: %s\n" % getMyCommandLine(), file=f)
+
+    #
+    # Invoke the default TextTestRunner to run the test suite, possibly iterating
+    # over different configurations.
+    #
+
+    iterArchs = False
+    iterCompilers = False
+
+    if not archs and "archs" in config:
+        archs = config["archs"]
+
+    if isinstance(archs, list) and len(archs) >= 1:
+        iterArchs = True
+
+    if not compilers and "compilers" in config:
+        compilers = config["compilers"]
+
+    #
+    # Add some intervention here to sanity check that the compilers requested are sane.
+    # If found not to be an executable program, the invalid one is dropped from the list.
+    for i in range(len(compilers)):
+        c = compilers[i]
+        if which(c):
+            continue
+        else:
+            if sys.platform.startswith("darwin"):
+                pipe = subprocess.Popen(['xcrun', '-find', c], stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+                cmd_output = pipe.stdout.read()
+                if cmd_output:
+                    if "not found" in cmd_output:
+                        print("dropping %s from the compilers used" % c)
+                        compilers.remove(i)
+                    else:
+                        compilers[i] = cmd_output.split('\n')[0]
+                        print("'xcrun -find %s' returning %s" % (c, compilers[i]))
+
+    if not parsable:
+        print("compilers=%s" % str(compilers))
+
+    if not compilers or len(compilers) == 0:
+        print("No eligible compiler found, exiting.")
+        exitTestSuite(1)
+
+    if isinstance(compilers, list) and len(compilers) >= 1:
+        iterCompilers = True
+
+    # Make a shallow copy of sys.path, we need to manipulate the search paths later.
+    # This is only necessary if we are relocated and with different configurations.
+    if rdir:
+        old_sys_path = sys.path[:]
+    # If we iterate on archs or compilers, there is a chance we want to split stderr/stdout.
+    if iterArchs or iterCompilers:
+        old_stderr = sys.stderr
+        old_stdout = sys.stdout
+        new_stderr = None
+        new_stdout = None
+
+    # Iterating over all possible architecture and compiler combinations.
+    for ia in range(len(archs) if iterArchs else 1):
+        archConfig = ""
+        if iterArchs:
+            os.environ["ARCH"] = archs[ia]
+            archConfig = "arch=%s" % archs[ia]
+        for ic in range(len(compilers) if iterCompilers else 1):
+            if iterCompilers:
+                os.environ["CC"] = compilers[ic]
+                configString = "%s compiler=%s" % (archConfig, compilers[ic])
+            else:
+                configString = archConfig
+
+            if iterArchs or iterCompilers:
+                # Translate ' ' to '-' for pathname component.
+                from string import maketrans
+                tbl = maketrans(' ', '-')
+                configPostfix = configString.translate(tbl)
+
+                # Check whether we need to split stderr/stdout into configuration
+                # specific files.
+                if old_stderr.name != '<stderr>' and config.get('split_stderr'):
+                    if new_stderr:
+                        new_stderr.close()
+                    new_stderr = open("%s.%s" % (old_stderr.name, configPostfix), "w")
+                    sys.stderr = new_stderr
+                if old_stdout.name != '<stdout>' and config.get('split_stdout'):
+                    if new_stdout:
+                        new_stdout.close()
+                    new_stdout = open("%s.%s" % (old_stdout.name, configPostfix), "w")
+                    sys.stdout = new_stdout
+
+                # If we specified a relocated directory to run the test suite, do
+                # the extra housekeeping to copy the testdirs to a configStringified
+                # directory and to update sys.path before invoking the test runner.
+                # The purpose is to separate the configuration-specific directories
+                # from each other.
+                if rdir:
+                    from shutil import copytree, rmtree, ignore_patterns
+
+                    newrdir = "%s.%s" % (rdir, configPostfix)
+
+                    # Copy the tree to a new directory with postfix name configPostfix.
+                    if os.path.exists(newrdir):
+                        rmtree(newrdir)
+                    copytree(rdir, newrdir, ignore=ignore_patterns('*.pyc', '*.o', '*.d'))
+
+                    # Update the LLDB_TEST environment variable to reflect new top
+                    # level test directory.
+                    #
+                    # See also lldbtest.TestBase.setUpClass(cls).
+                    if len(testdirs) == 1 and os.path.basename(testdirs[0]) == 'test':
+                        os.environ["LLDB_TEST"] = os.path.join(newrdir, 'test')
+                    else:
+                        os.environ["LLDB_TEST"] = newrdir
+
+                    # And update the Python search paths for modules.
+                    sys.path = [x.replace(rdir, newrdir, 1) for x in old_sys_path]
+
+                # Output the configuration.
+                if not parsable:
+                    sys.stderr.write("\nConfiguration: " + configString + "\n")
+
+            #print("sys.stderr name is", sys.stderr.name)
+            #print("sys.stdout name is", sys.stdout.name)
+
+            # First, write out the number of collected test cases.
+            if not parsable:
+                sys.stderr.write(separator + "\n")
+                sys.stderr.write("Collected %d test%s\n\n"
+                                 % (suite.countTestCases(),
+                                    suite.countTestCases() != 1 and "s" or ""))
+
+            class LLDBTestResult(unittest2.TextTestResult):
+                """
+                Enforce a singleton pattern to allow introspection of test progress.
+
+                Overwrite addError(), addFailure(), and addExpectedFailure() methods
+                to enable each test instance to track its failure/error status.  It
+                is used in the LLDB test framework to emit detailed trace messages
+                to a log file for easier human inspection of test failures/errors.
+                """
+                __singleton__ = None
+                __ignore_singleton__ = False
+
+                @staticmethod
+                def getTerminalSize():
+                    import os
+                    env = os.environ
+                    def ioctl_GWINSZ(fd):
+                        try:
+                            import fcntl, termios, struct, os
+                            cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ,
+                        '1234'))
+                        except:
+                            return
+                        return cr
+                    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
+                    if not cr:
+                        try:
+                            fd = os.open(os.ctermid(), os.O_RDONLY)
+                            cr = ioctl_GWINSZ(fd)
+                            os.close(fd)
+                        except:
+                            pass
+                    if not cr:
+                        cr = (env.get('LINES', 25), env.get('COLUMNS', 80))
+                    return int(cr[1]), int(cr[0])
+
+                def __init__(self, *args):
+                    if not LLDBTestResult.__ignore_singleton__ and LLDBTestResult.__singleton__:
+                        raise Exception("LLDBTestResult instantiated more than once")
+                    super(LLDBTestResult, self).__init__(*args)
+                    LLDBTestResult.__singleton__ = self
+                    # Now put this singleton into the lldb module namespace.
+                    lldb.test_result = self
+                    # Computes the format string for displaying the counter.
+                    global suite
+                    counterWidth = len(str(suite.countTestCases()))
+                    self.fmt = "%" + str(counterWidth) + "d: "
+                    self.indentation = ' ' * (counterWidth + 2)
+                    # This counts from 1 .. suite.countTestCases().
+                    self.counter = 0
+                    (width, height) = LLDBTestResult.getTerminalSize()
+                    self.progressbar = None
+                    global progress_bar
+                    if width > 10 and not parsable and progress_bar:
+                        try:
+                            self.progressbar = progress.ProgressWithEvents(stdout=self.stream,start=0,end=suite.countTestCases(),width=width-10)
+                        except:
+                            self.progressbar = None
+                    self.results_formatter = results_formatter_object
+
+                def _config_string(self, test):
+                  compiler = getattr(test, "getCompiler", None)
+                  arch = getattr(test, "getArchitecture", None)
+                  return "%s-%s" % (compiler() if compiler else "", arch() if arch else "")
+
+                def _exc_info_to_string(self, err, test):
+                    """Overrides superclass TestResult's method in order to append
+                    our test config info string to the exception info string."""
+                    if hasattr(test, "getArchitecture") and hasattr(test, "getCompiler"):
+                        return '%sConfig=%s-%s' % (super(LLDBTestResult, self)._exc_info_to_string(err, test),
+                                                                  test.getArchitecture(),
+                                                                  test.getCompiler())
+                    else:
+                        return super(LLDBTestResult, self)._exc_info_to_string(err, test)
+
+                def getDescription(self, test):
+                    doc_first_line = test.shortDescription()
+                    if self.descriptions and doc_first_line:
+                        return '\n'.join((str(test), self.indentation + doc_first_line))
+                    else:
+                        return str(test)
+
+                def getCategoriesForTest(self,test):
+                    if hasattr(test,"_testMethodName"):
+                        test_method = getattr(test,"_testMethodName")
+                        test_method = getattr(test,test_method)
+                    else:
+                        test_method = None
+                    if test_method != None and hasattr(test_method,"getCategories"):
+                        test_categories = test_method.getCategories(test)
+                    elif hasattr(test,"getCategories"):
+                        test_categories = test.getCategories()
+                    elif inspect.ismethod(test) and test.__self__ != None and hasattr(test.__self__,"getCategories"):
+                        test_categories = test.__self__.getCategories()
+                    else:
+                        test_categories = []
+                    if test_categories == None:
+                        test_categories = []
+                    return test_categories
+
+                def hardMarkAsSkipped(self,test):
+                    getattr(test, test._testMethodName).__func__.__unittest_skip__ = True
+                    getattr(test, test._testMethodName).__func__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
+                    test.__class__.__unittest_skip__ = True
+                    test.__class__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
+
+                def startTest(self, test):
+                    if shouldSkipBecauseOfCategories(self.getCategoriesForTest(test)):
+                        self.hardMarkAsSkipped(test)
+                    global setCrashInfoHook
+                    setCrashInfoHook("%s at %s" % (str(test),inspect.getfile(test.__class__)))
+                    self.counter += 1
+                    #if self.counter == 4:
+                    #    import crashinfo
+                    #    crashinfo.testCrashReporterDescription(None)
+                    test.test_number = self.counter
+                    if self.showAll:
+                        self.stream.write(self.fmt % self.counter)
+                    super(LLDBTestResult, self).startTest(test)
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_start(test))
+
+                def addSuccess(self, test):
+                    global parsable
+                    super(LLDBTestResult, self).addSuccess(test)
+                    if parsable:
+                        self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_success(test))
+
+                def addError(self, test, err):
+                    global sdir_has_content
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addError(test, err)
+                    method = getattr(test, "markError", None)
+                    if method:
+                        method()
+                    if parsable:
+                        self.stream.write("FAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_error(test, err))
+
+                def addCleanupError(self, test, err):
+                    global sdir_has_content
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addCleanupError(test, err)
+                    method = getattr(test, "markCleanupError", None)
+                    if method:
+                        method()
+                    if parsable:
+                        self.stream.write("CLEANUP ERROR: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_cleanup_error(
+                                test, err))
+
+                def addFailure(self, test, err):
+                    global sdir_has_content
+                    global failuresPerCategory
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addFailure(test, err)
+                    method = getattr(test, "markFailure", None)
+                    if method:
+                        method()
+                    if parsable:
+                        self.stream.write("FAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if useCategories:
+                        test_categories = self.getCategoriesForTest(test)
+                        for category in test_categories:
+                            if category in failuresPerCategory:
+                                failuresPerCategory[category] = failuresPerCategory[category] + 1
+                            else:
+                                failuresPerCategory[category] = 1
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_failure(test, err))
+
+
+                def addExpectedFailure(self, test, err, bugnumber):
+                    global sdir_has_content
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addExpectedFailure(test, err, bugnumber)
+                    method = getattr(test, "markExpectedFailure", None)
+                    if method:
+                        method(err, bugnumber)
+                    if parsable:
+                        self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_expected_failure(
+                            test, err, bugnumber))
+
+                def addSkip(self, test, reason):
+                    global sdir_has_content
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addSkip(test, reason)
+                    method = getattr(test, "markSkippedTest", None)
+                    if method:
+                        method()
+                    if parsable:
+                        self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_skip(test, reason))
+
+                def addUnexpectedSuccess(self, test, bugnumber):
+                    global sdir_has_content
+                    global parsable
+                    sdir_has_content = True
+                    super(LLDBTestResult, self).addUnexpectedSuccess(test, bugnumber)
+                    method = getattr(test, "markUnexpectedSuccess", None)
+                    if method:
+                        method(bugnumber)
+                    if parsable:
+                        self.stream.write("XPASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
+                    if self.results_formatter:
+                        self.results_formatter.handle_event(
+                            EventBuilder.event_for_unexpected_success(
+                                test, bugnumber))
+
+
+            if parsable:
+                v = 0
+            elif progress_bar:
+                v = 1
+            else:
+                v = verbose
+
+            # Invoke the test runner.
+            if count == 1:
+                result = unittest2.TextTestRunner(stream=sys.stderr,
+                                                  verbosity=v,
+                                                  failfast=failfast,
+                                                  resultclass=LLDBTestResult).run(suite)
+            else:
+                # We are invoking the same test suite more than once.  In this case,
+                # mark __ignore_singleton__ flag as True so the signleton pattern is
+                # not enforced.
+                LLDBTestResult.__ignore_singleton__ = True
+                for i in range(count):
+               
+                    result = unittest2.TextTestRunner(stream=sys.stderr,
+                                                      verbosity=v,
+                                                      failfast=failfast,
+                                                      resultclass=LLDBTestResult).run(suite)
+
+            failed = failed or not result.wasSuccessful()
+
+    if sdir_has_content and not parsable:
+        sys.stderr.write("Session logs for test failures/errors/unexpected successes"
+                         " can be found in directory '%s'\n" % sdir_name)
+
+    if useCategories and len(failuresPerCategory) > 0:
+        sys.stderr.write("Failures per category:\n")
+        for category in failuresPerCategory:
+            sys.stderr.write("%s - %d\n" % (category,failuresPerCategory[category]))
+
+    os.chdir(where_to_save_session)
+    fname = os.path.join(sdir_name, "TestFinished-%d" % os.getpid())
+    with open(fname, "w") as f:
+        print("Test finished at: %s\n" % datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S"), file=f)
+
+    # Terminate the test suite if ${LLDB_TESTSUITE_FORCE_FINISH} is defined.
+    # This should not be necessary now.
+    if ("LLDB_TESTSUITE_FORCE_FINISH" in os.environ):
+        print("Terminating Test suite...")
+        subprocess.Popen(["/bin/sh", "-c", "kill %s; exit 0" % (os.getpid())])
+
+    # Exiting.
+    exitTestSuite(failed)
+
+if __name__ == "__main__":
+    run_suite()
\ No newline at end of file
diff --git a/lldb/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 0caf73e1015..0caf73e1015 100644
--- a/lldb/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
diff --git a/lldb/test/dotest_channels.py b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
index e1922876b49..e1922876b49 100644
--- a/lldb/test/dotest_channels.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_channels.py
diff --git a/lldb/test/driver/batch_mode/Makefile b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/driver/batch_mode/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/Makefile
diff --git a/lldb/test/driver/batch_mode/TestBatchMode.py b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
index 640f6120b26..640f6120b26 100644
--- a/lldb/test/driver/batch_mode/TestBatchMode.py
+++ b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/TestBatchMode.py
diff --git a/lldb/test/driver/batch_mode/main.c b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/main.c
index 418160eaa36..418160eaa36 100644
--- a/lldb/test/driver/batch_mode/main.c
+++ b/lldb/packages/Python/lldbsuite/test/driver/batch_mode/main.c
diff --git a/lldb/test/example/TestSequenceFunctions.py b/lldb/packages/Python/lldbsuite/test/example/TestSequenceFunctions.py
index a0852930064..a0852930064 100644
--- a/lldb/test/example/TestSequenceFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/example/TestSequenceFunctions.py
diff --git a/lldb/test/expression_command/.categories b/lldb/packages/Python/lldbsuite/test/expression_command/.categories
index 897e40a99dd..897e40a99dd 100644
--- a/lldb/test/expression_command/.categories
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/.categories
diff --git a/lldb/test/expression_command/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/Makefile
index d4b82b3db27..d4b82b3db27 100644
--- a/lldb/test/expression_command/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/Makefile
diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
index 11caf627744..11caf627744 100644
--- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
diff --git a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
index 1cd2d83373f..1cd2d83373f 100644
--- a/lldb/test/expression_command/call-function/TestCallStopAndContinue.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStopAndContinue.py
diff --git a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
index 3b101285750..3b101285750 100644
--- a/lldb/test/expression_command/call-function/TestCallUserDefinedFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallUserDefinedFunction.py
diff --git a/lldb/test/expression_command/call-function/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/main.cpp
index 9b494c712bc..9b494c712bc 100644
--- a/lldb/test/expression_command/call-function/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/main.cpp
diff --git a/lldb/test/expression_command/call-restarts/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/Makefile
index 1c93ae1de43..1c93ae1de43 100644
--- a/lldb/test/expression_command/call-restarts/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/Makefile
diff --git a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
index 38f0ab73db4..38f0ab73db4 100644
--- a/lldb/test/expression_command/call-restarts/TestCallThatRestarts.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/TestCallThatRestarts.py
diff --git a/lldb/test/expression_command/call-restarts/lotta-signals.c b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/lotta-signals.c
index f5c15b41e2d..f5c15b41e2d 100644
--- a/lldb/test/expression_command/call-restarts/lotta-signals.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-restarts/lotta-signals.c
diff --git a/lldb/test/expression_command/call-throws/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/Makefile
index ac07b31c48c..ac07b31c48c 100644
--- a/lldb/test/expression_command/call-throws/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/Makefile
diff --git a/lldb/test/expression_command/call-throws/TestCallThatThrows.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
index 874c9f7da07..874c9f7da07 100644
--- a/lldb/test/expression_command/call-throws/TestCallThatThrows.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/TestCallThatThrows.py
diff --git a/lldb/test/expression_command/call-throws/call-throws.m b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/call-throws.m
index a184718be7d..a184718be7d 100644
--- a/lldb/test/expression_command/call-throws/call-throws.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-throws/call-throws.m
diff --git a/lldb/test/expression_command/char/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/char/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/expression_command/char/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/char/Makefile
diff --git a/lldb/test/expression_command/char/TestExprsChar.py b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
index cb57fdb1b7b..cb57fdb1b7b 100644
--- a/lldb/test/expression_command/char/TestExprsChar.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
diff --git a/lldb/test/expression_command/char/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/char/main.cpp
index c8b0beb1b35..c8b0beb1b35 100644
--- a/lldb/test/expression_command/char/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/char/main.cpp
diff --git a/lldb/test/expression_command/expr-in-syscall/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/expression_command/expr-in-syscall/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/Makefile
diff --git a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
index f115f13f773..f115f13f773 100644
--- a/lldb/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/TestExpressionInSyscall.py
diff --git a/lldb/test/expression_command/expr-in-syscall/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/main.cpp
index 743b69434d5..743b69434d5 100644
--- a/lldb/test/expression_command/expr-in-syscall/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/expr-in-syscall/main.cpp
diff --git a/lldb/test/expression_command/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/expression_command/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/Makefile
diff --git a/lldb/test/expression_command/formatters/TestFormatters.py b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
index 6fb6cd8bcd7..6fb6cd8bcd7 100644
--- a/lldb/test/expression_command/formatters/TestFormatters.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/TestFormatters.py
diff --git a/lldb/test/expression_command/formatters/foosynth.py b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/foosynth.py
index 91c4d4a84c6..91c4d4a84c6 100644
--- a/lldb/test/expression_command/formatters/foosynth.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/foosynth.py
diff --git a/lldb/test/expression_command/formatters/formatters.py b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/formatters.py
index ce922a8f911..ce922a8f911 100644
--- a/lldb/test/expression_command/formatters/formatters.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/formatters.py
diff --git a/lldb/test/expression_command/formatters/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/main.cpp
index 4c3b180f370..4c3b180f370 100644
--- a/lldb/test/expression_command/formatters/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/formatters/main.cpp
diff --git a/lldb/test/expression_command/issue_11588/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/expression_command/issue_11588/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Makefile
diff --git a/lldb/test/expression_command/issue_11588/Test11588.py b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
index 5941cb50946..5941cb50946 100644
--- a/lldb/test/expression_command/issue_11588/Test11588.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/Test11588.py
diff --git a/lldb/test/expression_command/issue_11588/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/main.cpp
index 4f9ea3abf18..4f9ea3abf18 100644
--- a/lldb/test/expression_command/issue_11588/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/main.cpp
diff --git a/lldb/test/expression_command/issue_11588/s11588.py b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
index 01bb09a1b0d..01bb09a1b0d 100644
--- a/lldb/test/expression_command/issue_11588/s11588.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/issue_11588/s11588.py
diff --git a/lldb/test/expression_command/options/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile
index 81ae6f6f16e..81ae6f6f16e 100644
--- a/lldb/test/expression_command/options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/options/Makefile
diff --git a/lldb/test/expression_command/options/TestExprOptions.py b/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
index 2c0eb6551ea..2c0eb6551ea 100644
--- a/lldb/test/expression_command/options/TestExprOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/options/TestExprOptions.py
diff --git a/lldb/test/expression_command/options/foo.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp
index 8a5a6a2b541..8a5a6a2b541 100644
--- a/lldb/test/expression_command/options/foo.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/options/foo.cpp
diff --git a/lldb/test/expression_command/options/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp
index ecd9a90f662..ecd9a90f662 100644
--- a/lldb/test/expression_command/options/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/options/main.cpp
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/Makefile
index 8066198300f..8066198300f 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/Makefile
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index e959450a5c7..e959450a5c7 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
diff --git a/lldb/test/expression_command/persist_objc_pointeetype/main.m b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/main.m
index a2b6b703d6c..a2b6b703d6c 100644
--- a/lldb/test/expression_command/persist_objc_pointeetype/main.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/main.m
diff --git a/lldb/test/expression_command/persistent_ptr_update/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/Makefile
index db5f575866d..db5f575866d 100644
--- a/lldb/test/expression_command/persistent_ptr_update/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/Makefile
diff --git a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
index 8d3e31d1632..8d3e31d1632 100644
--- a/lldb/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/TestPersistentPtrUpdate.py
diff --git a/lldb/test/expression_command/persistent_ptr_update/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/main.c
index 73346969ecc..73346969ecc 100644
--- a/lldb/test/expression_command/persistent_ptr_update/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_ptr_update/main.c
diff --git a/lldb/test/expression_command/persistent_types/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/expression_command/persistent_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/Makefile
diff --git a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
index fdc8b68bddd..fdc8b68bddd 100644
--- a/lldb/test/expression_command/persistent_types/TestNestedPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestNestedPersistentTypes.py
diff --git a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
index 48ee99fe780..48ee99fe780 100644
--- a/lldb/test/expression_command/persistent_types/TestPersistentTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/TestPersistentTypes.py
diff --git a/lldb/test/expression_command/persistent_types/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/main.c
index 9e26e619bfd..9e26e619bfd 100644
--- a/lldb/test/expression_command/persistent_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_types/main.c
diff --git a/lldb/test/expression_command/persistent_variables/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/expression_command/persistent_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/Makefile
diff --git a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
index 6790014f5e6..6790014f5e6 100644
--- a/lldb/test/expression_command/persistent_variables/TestPersistentVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/TestPersistentVariables.py
diff --git a/lldb/test/expression_command/persistent_variables/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/main.c
index fd41471df8e..fd41471df8e 100644
--- a/lldb/test/expression_command/persistent_variables/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persistent_variables/main.c
diff --git a/lldb/test/expression_command/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
index 4464e2ee9f5..4464e2ee9f5 100644
--- a/lldb/test/expression_command/po_verbosity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
diff --git a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
index b50cc262586..b50cc262586 100644
--- a/lldb/test/expression_command/po_verbosity/TestPoVerbosity.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/TestPoVerbosity.py
diff --git a/lldb/test/expression_command/po_verbosity/main.m b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
index 3dbb024b280..3dbb024b280 100644
--- a/lldb/test/expression_command/po_verbosity/main.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
diff --git a/lldb/test/expression_command/radar_8638051/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/expression_command/radar_8638051/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Makefile
diff --git a/lldb/test/expression_command/radar_8638051/Test8638051.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
index 3b61a468848..3b61a468848 100644
--- a/lldb/test/expression_command/radar_8638051/Test8638051.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/Test8638051.py
diff --git a/lldb/test/expression_command/radar_8638051/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/main.c
index 1329fd69a2e..1329fd69a2e 100644
--- a/lldb/test/expression_command/radar_8638051/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_8638051/main.c
diff --git a/lldb/test/expression_command/radar_9531204/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/expression_command/radar_9531204/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/Makefile
diff --git a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
index e7821a68f29..e7821a68f29 100644
--- a/lldb/test/expression_command/radar_9531204/TestPrintfAfterUp.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/TestPrintfAfterUp.py
diff --git a/lldb/test/expression_command/radar_9531204/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/main.c
index 2bf05f2b306..2bf05f2b306 100644
--- a/lldb/test/expression_command/radar_9531204/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9531204/main.c
diff --git a/lldb/test/expression_command/radar_9673664/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/expression_command/radar_9673664/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/Makefile
diff --git a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
index 7d7c8ed046c..7d7c8ed046c 100644
--- a/lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/TestExprHelpExamples.py
diff --git a/lldb/test/expression_command/radar_9673664/main.c b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/main.c
index 934abdfaef3..934abdfaef3 100644
--- a/lldb/test/expression_command/radar_9673664/main.c
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/radar_9673664/main.c
diff --git a/lldb/test/expression_command/test/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/test/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/expression_command/test/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/Makefile
diff --git a/lldb/test/expression_command/test/TestExprs.py b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
index 70d36896dcd..70d36896dcd 100644
--- a/lldb/test/expression_command/test/TestExprs.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs.py
diff --git a/lldb/test/expression_command/test/TestExprs2.py b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
index 672521dd1d1..672521dd1d1 100644
--- a/lldb/test/expression_command/test/TestExprs2.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/TestExprs2.py
diff --git a/lldb/test/expression_command/test/main.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/test/main.cpp
index 22208a87cb4..22208a87cb4 100644
--- a/lldb/test/expression_command/test/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/test/main.cpp
diff --git a/lldb/test/expression_command/timeout/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile
index c9cff412c1b..c9cff412c1b 100644
--- a/lldb/test/expression_command/timeout/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/Makefile
diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
index 6e3e8879073..6e3e8879073 100644
--- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/TestCallWithTimeout.py
diff --git a/lldb/test/expression_command/timeout/wait-a-while.cpp b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp
index ac37c5d243b..ac37c5d243b 100644
--- a/lldb/test/expression_command/timeout/wait-a-while.cpp
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/timeout/wait-a-while.cpp
diff --git a/lldb/test/expression_command/two-files/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/Makefile
index 5974461e256..5974461e256 100644
--- a/lldb/test/expression_command/two-files/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/Makefile
diff --git a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
index 7e67b334e4d..7e67b334e4d 100644
--- a/lldb/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/TestObjCTypeQueryFromOtherCompileUnit.py
diff --git a/lldb/test/expression_command/two-files/foo.m b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/foo.m
index 1609ebd838f..1609ebd838f 100644
--- a/lldb/test/expression_command/two-files/foo.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/foo.m
diff --git a/lldb/test/expression_command/two-files/main.m b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/main.m
index 3f5738314e6..3f5738314e6 100644
--- a/lldb/test/expression_command/two-files/main.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/two-files/main.m
diff --git a/lldb/test/functionalities/abbreviation/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/abbreviation/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/.categories
diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
index 469d9a5c789..469d9a5c789 100644
--- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestAbbreviations.py
diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
index ba8a0a66013..ba8a0a66013 100644
--- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/abbreviation/TestCommonShortSpellings.py
diff --git a/lldb/test/functionalities/alias/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/alias/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/alias/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/alias/.categories
diff --git a/lldb/test/functionalities/archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile
index 64da83becbd..64da83becbd 100644
--- a/lldb/test/functionalities/archives/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile
diff --git a/lldb/test/functionalities/archives/README b/lldb/packages/Python/lldbsuite/test/functionalities/archives/README
index d327f4585c6..d327f4585c6 100644
--- a/lldb/test/functionalities/archives/README
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/README
diff --git a/lldb/test/functionalities/archives/TestBSDArchives.py b/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
index b51c3ebe510..b51c3ebe510 100644
--- a/lldb/test/functionalities/archives/TestBSDArchives.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/TestBSDArchives.py
diff --git a/lldb/test/functionalities/archives/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/archives/a.c
index 2b6ebbe47a7..2b6ebbe47a7 100644
--- a/lldb/test/functionalities/archives/a.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/a.c
diff --git a/lldb/test/functionalities/archives/b.c b/lldb/packages/Python/lldbsuite/test/functionalities/archives/b.c
index 51d77dd4bcd..51d77dd4bcd 100644
--- a/lldb/test/functionalities/archives/b.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/b.c
diff --git a/lldb/test/functionalities/archives/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/archives/main.c
index c5b1cc2f0d1..c5b1cc2f0d1 100644
--- a/lldb/test/functionalities/archives/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/main.c
diff --git a/lldb/test/functionalities/asan/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile
index 0412ba1a30d..0412ba1a30d 100644
--- a/lldb/test/functionalities/asan/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/Makefile
diff --git a/lldb/test/functionalities/asan/TestMemoryHistory.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
index 088a3a3262b..088a3a3262b 100644
--- a/lldb/test/functionalities/asan/TestMemoryHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestMemoryHistory.py
diff --git a/lldb/test/functionalities/asan/TestReportData.py b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
index 8bc931df6e0..8bc931df6e0 100644
--- a/lldb/test/functionalities/asan/TestReportData.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/TestReportData.py
diff --git a/lldb/test/functionalities/asan/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/asan/main.c
index fab760e49f0..fab760e49f0 100644
--- a/lldb/test/functionalities/asan/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/asan/main.c
diff --git a/lldb/test/functionalities/attach_resume/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/Makefile
index 13d40a13b3e..13d40a13b3e 100644
--- a/lldb/test/functionalities/attach_resume/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/Makefile
diff --git a/lldb/test/functionalities/attach_resume/TestAttachResume.py b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
index fa8c093d1c1..fa8c093d1c1 100644
--- a/lldb/test/functionalities/attach_resume/TestAttachResume.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/TestAttachResume.py
diff --git a/lldb/test/functionalities/attach_resume/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/main.cpp
index 7cf36025854..7cf36025854 100644
--- a/lldb/test/functionalities/attach_resume/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/attach_resume/main.cpp
diff --git a/lldb/test/functionalities/avoids-fd-leak/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/avoids-fd-leak/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/Makefile
diff --git a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
index 0f1014a8182..0f1014a8182 100644
--- a/lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/TestFdLeak.py
diff --git a/lldb/test/functionalities/avoids-fd-leak/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/main.c
index 5bdf227928e..5bdf227928e 100644
--- a/lldb/test/functionalities/avoids-fd-leak/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/avoids-fd-leak/main.c
diff --git a/lldb/test/functionalities/backticks/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/backticks/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/backticks/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/backticks/.categories
diff --git a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py b/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
index 1b10e3a250d..1b10e3a250d 100644
--- a/lldb/test/functionalities/backticks/TestBackticksWithoutATarget.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/backticks/TestBackticksWithoutATarget.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile
index a6376f9b165..a6376f9b165 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
index 256f790de57..256f790de57 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommand.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
index 83997617f0e..83997617f0e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestBreakpointCommandsFromPython.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
index 57b0f0f405e..57b0f0f405e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/TestRegexpBreakCommand.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c
index 870e4a6ab16..870e4a6ab16 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/a.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/a.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/b.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c
index 02b78e7bd85..02b78e7bd85 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/b.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/b.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py
index 4bbb0327eac..4bbb0327eac 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/bktptcmd.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_command/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c
index 62ec97f4328..62ec97f4328 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_command/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_command/main.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
index 6067ee45e98..6067ee45e98 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
index a60d559965e..a60d559965e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/TestBreakpointConditions.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_conditions/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c
index 1aa8235e1b0..1aa8235e1b0 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_conditions/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_conditions/main.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
index f89b52a972e..f89b52a972e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ids/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
index 346a35c7835..346a35c7835 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/TestBreakpointIDs.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ids/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp
index 3deef22c93c..3deef22c93c 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ids/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ids/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
index 9000f8f47a9..9000f8f47a9 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/TestBreakpointIgnoreCount.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
index b74b37b48b0..b74b37b48b0 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_ignore_count/main.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
index 7934cd5db42..7934cd5db42 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_locations/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
index c57dae18471..c57dae18471 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/TestBreakpointLocations.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_locations/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c
index 7ec3ded67b7..7ec3ded67b7 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_locations/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_locations/main.c
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile
index 457c4972f2d..457c4972f2d 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/Makefile
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
index a808e5f4fdd..a808e5f4fdd 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/TestBreakpointOptions.py
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/foo.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp
index e5d0e09803e..e5d0e09803e 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/foo.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/foo.cpp
diff --git a/lldb/test/functionalities/breakpoint/breakpoint_options/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp
index 363b90003d7..363b90003d7 100644
--- a/lldb/test/functionalities/breakpoint/breakpoint_options/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/breakpoint_options/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/comp_dir_symlink/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
index 0ac34a186b2..0ac34a186b2 100644
--- a/lldb/test/functionalities/breakpoint/comp_dir_symlink/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/Makefile
diff --git a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
index 850d12fa732..850d12fa732 100644
--- a/lldb/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/TestCompDirSymLink.py
diff --git a/lldb/test/functionalities/breakpoint/comp_dir_symlink/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp
index fef06a011e9..fef06a011e9 100644
--- a/lldb/test/functionalities/breakpoint/comp_dir_symlink/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/comp_dir_symlink/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/Makefile
index f89b52a972e..f89b52a972e 100644
--- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/Makefile
diff --git a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
index beebc0b1301..beebc0b1301 100644
--- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/TestConsecutiveBreakpoints.py
diff --git a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/main.cpp
index c1943f03dbf..c1943f03dbf 100644
--- a/lldb/test/functionalities/breakpoint/consecutive_breakpoins/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/consecutive_breakpoins/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
index f89b52a972e..f89b52a972e 100644
--- a/lldb/test/functionalities/breakpoint/cpp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/Makefile
diff --git a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
index 87fc4488c36..87fc4488c36 100644
--- a/lldb/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/TestCPPBreakpointLocations.py
diff --git a/lldb/test/functionalities/breakpoint/cpp/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
index ef582aa36eb..ef582aa36eb 100644
--- a/lldb/test/functionalities/breakpoint/cpp/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/breakpoint/cpp_exception/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/Makefile
diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
index ede32f58ed1..ede32f58ed1 100644
--- a/lldb/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/TestCPPExceptionBreakpoint.py
diff --git a/lldb/test/functionalities/breakpoint/cpp_exception/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp
index 76cb22735a7..76cb22735a7 100644
--- a/lldb/test/functionalities/breakpoint/cpp_exception/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/cpp_exception/main.cpp
diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
index 7934cd5db42..7934cd5db42 100644
--- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/Makefile
diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
index 1a734890974..1a734890974 100644
--- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/TestBreakpointsWithNoTargets.py
diff --git a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c
index e1f03237cd1..e1f03237cd1 100644
--- a/lldb/test/functionalities/breakpoint/dummy_target_breakpoints/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/dummy_target_breakpoints/main.c
diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile
index 5b73ae626f3..5b73ae626f3 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/Makefile
diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
index 4358eeb02b6..4358eeb02b6 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/TestInlinedBreakpoints.py
diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
index 5881afe1f39..5881afe1f39 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/basic_type.cpp
diff --git a/lldb/test/functionalities/breakpoint/inlined_breakpoints/int.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
index 922398b1c6e..922398b1c6e 100644
--- a/lldb/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/inlined_breakpoints/int.cpp
diff --git a/lldb/test/functionalities/breakpoint/objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/functionalities/breakpoint/objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/Makefile
diff --git a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
index fd09794b474..fd09794b474 100644
--- a/lldb/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/TestObjCBreakpoints.py
diff --git a/lldb/test/functionalities/breakpoint/objc/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m
index 53567491219..53567491219 100644
--- a/lldb/test/functionalities/breakpoint/objc/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/breakpoint/objc/main.m
diff --git a/lldb/test/functionalities/command_history/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/command_history/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/.categories
diff --git a/lldb/test/functionalities/command_history/TestCommandHistory.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
index e8a7ccdfa00..e8a7ccdfa00 100644
--- a/lldb/test/functionalities/command_history/TestCommandHistory.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_history/TestCommandHistory.py
diff --git a/lldb/test/functionalities/command_regex/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/command_regex/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/.categories
diff --git a/lldb/test/functionalities/command_regex/TestCommandRegex.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
index 98dfc9765b5..98dfc9765b5 100644
--- a/lldb/test/functionalities/command_regex/TestCommandRegex.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_regex/TestCommandRegex.py
diff --git a/lldb/test/functionalities/command_script/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/command_script/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/.categories
diff --git a/lldb/test/functionalities/command_script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/command_script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/Makefile
diff --git a/lldb/test/functionalities/command_script/TestCommandScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
index f6875a4b4ca..f6875a4b4ca 100644
--- a/lldb/test/functionalities/command_script/TestCommandScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/TestCommandScript.py
diff --git a/lldb/test/functionalities/command_script/bug11569.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py
index 93897d88098..93897d88098 100644
--- a/lldb/test/functionalities/command_script/bug11569.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/bug11569.py
diff --git a/lldb/test/functionalities/command_script/import/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/Makefile
index 9374aef487f..9374aef487f 100644
--- a/lldb/test/functionalities/command_script/import/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/Makefile
diff --git a/lldb/test/functionalities/command_script/import/TestImport.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
index 3a317d358df..3a317d358df 100644
--- a/lldb/test/functionalities/command_script/import/TestImport.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/TestImport.py
diff --git a/lldb/test/functionalities/command_script/import/bar/bar.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py
index bbc41f3b217..bbc41f3b217 100644
--- a/lldb/test/functionalities/command_script/import/bar/bar.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/bar.py
diff --git a/lldb/test/functionalities/command_script/import/bar/barutil.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py
index 0d3d2eb1b2d..0d3d2eb1b2d 100644
--- a/lldb/test/functionalities/command_script/import/bar/barutil.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/bar/barutil.py
diff --git a/lldb/test/functionalities/command_script/import/dummymodule.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py
index dcc724ec9c2..dcc724ec9c2 100644
--- a/lldb/test/functionalities/command_script/import/dummymodule.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/dummymodule.py
diff --git a/lldb/test/functionalities/command_script/import/foo/bar/foobar.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py
index 659ded22c90..659ded22c90 100644
--- a/lldb/test/functionalities/command_script/import/foo/bar/foobar.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/bar/foobar.py
diff --git a/lldb/test/functionalities/command_script/import/foo/foo.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py
index 51cc0c3bab1..51cc0c3bab1 100644
--- a/lldb/test/functionalities/command_script/import/foo/foo.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo.py
diff --git a/lldb/test/functionalities/command_script/import/foo/foo2.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py
index 6863454ca6e..6863454ca6e 100644
--- a/lldb/test/functionalities/command_script/import/foo/foo2.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/foo/foo2.py
diff --git a/lldb/test/functionalities/command_script/import/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/main.c
index dffc8c77b04..dffc8c77b04 100644
--- a/lldb/test/functionalities/command_script/import/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/main.c
diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/Makefile
index 7913aaa4b74..7913aaa4b74 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/Makefile
diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
index 9f8aa1dc326..9f8aa1dc326 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/TestRdar12586188.py
diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/fail12586188.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py
index add85a73f85..add85a73f85 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/fail12586188.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail12586188.py
diff --git a/lldb/test/functionalities/command_script/import/rdar-12586188/fail212586188.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py
index 1549a036590..1549a036590 100644
--- a/lldb/test/functionalities/command_script/import/rdar-12586188/fail212586188.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/rdar-12586188/fail212586188.py
diff --git a/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
index 8d8d7f1c53f..8d8d7f1c53f 100644
--- a/lldb/test/functionalities/command_script/import/thepackage/TPunitA.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitA.py
diff --git a/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
index e74686ed619..e74686ed619 100644
--- a/lldb/test/functionalities/command_script/import/thepackage/TPunitB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/TPunitB.py
diff --git a/lldb/test/functionalities/command_script/import/thepackage/__init__.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py
index faa4e3b0cbf..faa4e3b0cbf 100644
--- a/lldb/test/functionalities/command_script/import/thepackage/__init__.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/import/thepackage/__init__.py
diff --git a/lldb/test/functionalities/command_script/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/main.cpp
index 0b24cb73a61..0b24cb73a61 100644
--- a/lldb/test/functionalities/command_script/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/main.cpp
diff --git a/lldb/test/functionalities/command_script/mysto.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py
index 656cd150293..656cd150293 100644
--- a/lldb/test/functionalities/command_script/mysto.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/mysto.py
diff --git a/lldb/test/functionalities/command_script/py_import b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/py_import
index 169daacc1a8..169daacc1a8 100644
--- a/lldb/test/functionalities/command_script/py_import
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/py_import
diff --git a/lldb/test/functionalities/command_script/welcome.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py
index 5dbf09fbbec..5dbf09fbbec 100644
--- a/lldb/test/functionalities/command_script/welcome.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_script/welcome.py
diff --git a/lldb/test/functionalities/command_source/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/command_source/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.categories
diff --git a/lldb/test/functionalities/command_source/.lldb b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.lldb
index c544523832e..c544523832e 100644
--- a/lldb/test/functionalities/command_source/.lldb
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/.lldb
diff --git a/lldb/test/functionalities/command_source/TestCommandSource.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
index c9aee18cad1..c9aee18cad1 100644
--- a/lldb/test/functionalities/command_source/TestCommandSource.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/TestCommandSource.py
diff --git a/lldb/test/functionalities/command_source/my.py b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/my.py
index cb2fd012e4b..cb2fd012e4b 100644
--- a/lldb/test/functionalities/command_source/my.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/command_source/my.py
diff --git a/lldb/test/functionalities/completion/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/completion/.categories
index 3a3f4df6416..3a3f4df6416 100644
--- a/lldb/test/functionalities/completion/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/.categories
diff --git a/lldb/test/functionalities/completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/Makefile
diff --git a/lldb/test/functionalities/completion/TestCompletion.py b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
index 980d353d26c..980d353d26c 100644
--- a/lldb/test/functionalities/completion/TestCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/TestCompletion.py
diff --git a/lldb/test/functionalities/completion/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/completion/main.cpp
index b408720d2cd..b408720d2cd 100644
--- a/lldb/test/functionalities/completion/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/completion/main.cpp
diff --git a/lldb/test/functionalities/conditional_break/.lldb b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/.lldb
index 4be90efee23..4be90efee23 100644
--- a/lldb/test/functionalities/conditional_break/.lldb
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/.lldb
diff --git a/lldb/test/functionalities/conditional_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/conditional_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/Makefile
diff --git a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
index 09674dd3516..09674dd3516 100644
--- a/lldb/test/functionalities/conditional_break/TestConditionalBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/TestConditionalBreak.py
diff --git a/lldb/test/functionalities/conditional_break/conditional_break.py b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py
index b30a34e56b1..b30a34e56b1 100644
--- a/lldb/test/functionalities/conditional_break/conditional_break.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/conditional_break.py
diff --git a/lldb/test/functionalities/conditional_break/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/main.c
index 1329fd69a2e..1329fd69a2e 100644
--- a/lldb/test/functionalities/conditional_break/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/conditional_break/main.c
diff --git a/lldb/test/functionalities/data-formatter/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/.categories
index fe1da0247c6..fe1da0247c6 100644
--- a/lldb/test/functionalities/data-formatter/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/.categories
diff --git a/lldb/test/functionalities/data-formatter/boolreference/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
index 261658b10ae..261658b10ae 100644
--- a/lldb/test/functionalities/data-formatter/boolreference/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/Makefile
diff --git a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
index ebd78182835..ebd78182835 100644
--- a/lldb/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/TestFormattersBoolRefPtr.py
diff --git a/lldb/test/functionalities/data-formatter/boolreference/main.mm b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/main.mm
index a2461fd9da9..a2461fd9da9 100644
--- a/lldb/test/functionalities/data-formatter/boolreference/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/boolreference/main.mm
diff --git a/lldb/test/functionalities/data-formatter/compactvectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
index 9b06ad7d705..9b06ad7d705 100644
--- a/lldb/test/functionalities/data-formatter/compactvectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/Makefile
diff --git a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
index 95b66e43700..95b66e43700 100644
--- a/lldb/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/TestCompactVectors.py
diff --git a/lldb/test/functionalities/data-formatter/compactvectors/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/main.cpp
index bbbd823ec31..bbbd823ec31 100644
--- a/lldb/test/functionalities/data-formatter/compactvectors/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/compactvectors/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
index a9fe04d480d..a9fe04d480d 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/TestDataFormatterAdv.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-advanced/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/main.cpp
index 2462e28db12..2462e28db12 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-advanced/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-advanced/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-categories/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
index e8150610a3e..e8150610a3e 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/TestDataFormatterCategories.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-categories/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/main.cpp
index b51dd45a7f6..b51dd45a7f6 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-categories/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-categories/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
index ffdd8078b23..ffdd8078b23 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/TestDataFormatterCpp.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-cpp/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/main.cpp
index 5bcfbfd4d46..5bcfbfd4d46 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-cpp/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-cpp/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
index 4eff86f3860..4eff86f3860 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/TestDataFormatterDisabling.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-disabling/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/main.cpp
index 9374642fb0d..9374642fb0d 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-disabling/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-disabling/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
index fe5a23b2749..fe5a23b2749 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/TestDataFormatterEnumFormat.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp
index 6a8074ff9fb..6a8074ff9fb 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-enum-format/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-globals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
index e96d2de5165..e96d2de5165 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/TestDataFormatterGlobals.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-globals/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/main.cpp
index 521f7a6931e..521f7a6931e 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-globals/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-globals/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
index e0f711598af..e0f711598af 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/TestDataFormatterNamedSummaries.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
index fdec5fecd3a..fdec5fecd3a 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-named-summaries/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories
index 6326dbcec91..6326dbcec91 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/.categories
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
index e44dcb53eeb..e44dcb53eeb 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/TestDataFormatterObjC.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
index 6eb7e021f70..6eb7e021f70 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/main.m
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
index 0d94c2247f1..0d94c2247f1 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
index 3300341825f..3300341825f 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/TestDataFormatterNSString.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
index 7b8c3785a18..7b8c3785a18 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-objc/nsstring/main.m
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
index d666e476f75..d666e476f75 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/TestFormattersOneIsSingular.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m
index 7204d3c7b20..7204d3c7b20 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-proper-plurals/main.m
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
index 1e6ef1c6360..1e6ef1c6360 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/TestPtrToArrayFormatting.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
index 15fa5614d7f..15fa5614d7f 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-ptr-to-array/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
index c2d1c1b2551..c2d1c1b2551 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/TestDataFormatterPythonSynth.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py
index 0dc2c233e2a..0dc2c233e2a 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/fooSynthProvider.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py
index d162b00db32..d162b00db32 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/ftsp.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
index 48b29dcfd6e..48b29dcfd6e 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-python-synth/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-script/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
index e27a2faabfb..e27a2faabfb 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/TestDataFormatterScript.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-script/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/main.cpp
index aaccb6329ac..aaccb6329ac 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-script/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-script/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
index b438bbb970f..b438bbb970f 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
index 24406ecf763..24406ecf763 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/TestDataFormatterSkipSummary.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp
index 82ffb2c20d4..82ffb2c20d4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-skip-summary/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
index fdc13f47e73..fdc13f47e73 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/TestDataFormatterSmartArray.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp
index 9279e414be3..9279e414be3 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-smart-array/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
index d37bef7dc5c..d37bef7dc5c 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
index 25f02c83781..25f02c83781 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
index 9109a20cb51..9109a20cb51 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
index 7bd47c0e900..7bd47c0e900 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
index 97b37851f53..97b37851f53 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
index 9a930b4c1d1..9a930b4c1d1 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
index a5dabdb6349..a5dabdb6349 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
index 69391030750..69391030750 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/TestDataFormatterLibcxxListLoop.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
index 6a1266528d5..6a1266528d5 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/loop/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
index 4f2bd74495a..4f2bd74495a 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
index 5522fe3fe26..5522fe3fe26 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
index 6247ca8b241..6247ca8b241 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
index 23c351420c7..23c351420c7 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp
index e8385994125..e8385994125 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
index 975c6fe6af1..975c6fe6af1 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
index 1e1dd3b1603..1e1dd3b1603 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
index d4646786c27..d4646786c27 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
index cc3033ef26e..cc3033ef26e 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
index 929aa99b42d..929aa99b42d 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp
index 9ca0da39cfc..9ca0da39cfc 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
index 306e389de26..306e389de26 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
index 4e8a1a779c0..4e8a1a779c0 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
index 637fa7e80bf..637fa7e80bf 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
index 67b4cf95148..67b4cf95148 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
index 7b9956ed36e..7b9956ed36e 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
index 1f609a41d90..1f609a41d90 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
index e6eb21c4b50..e6eb21c4b50 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp
index a9aeacf90e4..a9aeacf90e4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
index 7fe01d004f0..7fe01d004f0 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
index a3074073065..a3074073065 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp
index d7b046c5bff..d7b046c5bff 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
index 7fe01d004f0..7fe01d004f0 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
index 8fa99c5b762..8fa99c5b762 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp
index 191acdcc97b..191acdcc97b 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
index 2c6c3cf7284..2c6c3cf7284 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
index 55d985c2c54..55d985c2c54 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp
index 568c35efe07..568c35efe07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
index 7fe01d004f0..7fe01d004f0 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
index 3436ff69a45..3436ff69a45 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp
index 4a9b4fc7d0d..4a9b4fc7d0d 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
index 2e8bcb9079b..2e8bcb9079b 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
index 8c7ba2b36a7..8c7ba2b36a7 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp
index 73956dd3fda..73956dd3fda 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
index 88cb026aba1..88cb026aba1 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
index 644e477edd6..644e477edd6 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp
index 010917995e4..010917995e4 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
index 04f39271f0c..04f39271f0c 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
index bd9e5334818..bd9e5334818 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/TestDataFormatterSynth.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synth/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/main.cpp
index bac38d84fae..bac38d84fae 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synth/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synth/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/Makefile
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
index d006c9a95b7..d006c9a95b7 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/TestDataFormatterSynthVal.py
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/main.cpp
index accbf0a5a57..accbf0a5a57 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py
index c8517a44293..c8517a44293 100644
--- a/lldb/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-synthval/myIntSynthProvider.py
diff --git a/lldb/test/functionalities/data-formatter/dump_dynamic/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
index 69dde1b7618..69dde1b7618 100644
--- a/lldb/test/functionalities/data-formatter/dump_dynamic/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/Makefile
diff --git a/lldb/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
index 642ff1f1a19..642ff1f1a19 100644
--- a/lldb/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/TestDumpDynamic.py
diff --git a/lldb/test/functionalities/data-formatter/dump_dynamic/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/main.cpp
index bc8e0582931..bc8e0582931 100644
--- a/lldb/test/functionalities/data-formatter/dump_dynamic/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/dump_dynamic/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/format-propagation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/format-propagation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/Makefile
diff --git a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
index b12e3b66336..b12e3b66336 100644
--- a/lldb/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/TestFormatPropagation.py
diff --git a/lldb/test/functionalities/data-formatter/format-propagation/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/main.cpp
index 5822fbc2a71..5822fbc2a71 100644
--- a/lldb/test/functionalities/data-formatter/format-propagation/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/format-propagation/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/Makefile
diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
index 48a981b0ede..48a981b0ede 100644
--- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/TestFrameFormatSmallStruct.py
diff --git a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp
index 120ef0ea091..120ef0ea091 100644
--- a/lldb/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/frameformat_smallstruct/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/hexcaps/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/hexcaps/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/Makefile
diff --git a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
index a7355277bf4..a7355277bf4 100644
--- a/lldb/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/TestDataFormatterHexCaps.py
diff --git a/lldb/test/functionalities/data-formatter/hexcaps/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/main.cpp
index 5ee113c17b2..5ee113c17b2 100644
--- a/lldb/test/functionalities/data-formatter/hexcaps/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/hexcaps/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/nsarraysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/nsarraysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
index e431fc0cbfa..e431fc0cbfa 100644
--- a/lldb/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/TestNSArraySynthetic.py
diff --git a/lldb/test/functionalities/data-formatter/nsarraysynth/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/main.m
index 1b4a6e03857..1b4a6e03857 100644
--- a/lldb/test/functionalities/data-formatter/nsarraysynth/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsarraysynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/nsdictionarysynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
index 5139088b767..5139088b767 100644
--- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/TestNSDictionarySynthetic.py
diff --git a/lldb/test/functionalities/data-formatter/nsdictionarysynth/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/main.m
index fdc533aeaf2..fdc533aeaf2 100644
--- a/lldb/test/functionalities/data-formatter/nsdictionarysynth/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nsdictionarysynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/nssetsynth/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
index 9f7fb1ca623..9f7fb1ca623 100644
--- a/lldb/test/functionalities/data-formatter/nssetsynth/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/Makefile
diff --git a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
index 92e1a3713e3..92e1a3713e3 100644
--- a/lldb/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/TestNSSetSynthetic.py
diff --git a/lldb/test/functionalities/data-formatter/nssetsynth/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/main.m
index 7bc49583606..7bc49583606 100644
--- a/lldb/test/functionalities/data-formatter/nssetsynth/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/nssetsynth/main.m
diff --git a/lldb/test/functionalities/data-formatter/ostypeformatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
index 261658b10ae..261658b10ae 100644
--- a/lldb/test/functionalities/data-formatter/ostypeformatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/Makefile
diff --git a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
index 11430ea74c7..11430ea74c7 100644
--- a/lldb/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/TestFormattersOsType.py
diff --git a/lldb/test/functionalities/data-formatter/ostypeformatting/main.mm b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/main.mm
index 8d22659374a..8d22659374a 100644
--- a/lldb/test/functionalities/data-formatter/ostypeformatting/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ostypeformatting/main.mm
diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
index d85e665333e..d85e665333e 100644
--- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/Makefile
diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
index 335cef3590e..335cef3590e 100644
--- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/TestPtrRef2Typedef.py
diff --git a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp
index 219f398da3f..219f398da3f 100644
--- a/lldb/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/ptr_ref_typedef/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/refpointer-recursion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/Makefile
diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
index a7a18220351..a7a18220351 100644
--- a/lldb/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/TestDataFormatterRefPtrRecursion.py
diff --git a/lldb/test/functionalities/data-formatter/refpointer-recursion/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/main.cpp
index 4b576bd266d..4b576bd266d 100644
--- a/lldb/test/functionalities/data-formatter/refpointer-recursion/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/refpointer-recursion/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/setvaluefromcstring/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
index 62a57f6cd9b..62a57f6cd9b 100644
--- a/lldb/test/functionalities/data-formatter/setvaluefromcstring/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/Makefile
diff --git a/lldb/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/TestSetValueFromCString.py
diff --git a/lldb/test/functionalities/data-formatter/setvaluefromcstring/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/main.m
index 3dd45508100..3dd45508100 100644
--- a/lldb/test/functionalities/data-formatter/setvaluefromcstring/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/setvaluefromcstring/main.m
diff --git a/lldb/test/functionalities/data-formatter/stringprinter/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
index 69dde1b7618..69dde1b7618 100644
--- a/lldb/test/functionalities/data-formatter/stringprinter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/Makefile
diff --git a/lldb/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
index 05deebd91e6..05deebd91e6 100644
--- a/lldb/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/TestStringPrinter.py
diff --git a/lldb/test/functionalities/data-formatter/stringprinter/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/main.cpp
index e30e8fb37f9..e30e8fb37f9 100644
--- a/lldb/test/functionalities/data-formatter/stringprinter/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/stringprinter/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/summary-string-onfail/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
index 04f39271f0c..04f39271f0c 100644
--- a/lldb/test/functionalities/data-formatter/summary-string-onfail/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Makefile
diff --git a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
index 3e139c1b414..3e139c1b414 100644
--- a/lldb/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/Test-rdar-9974002.py
diff --git a/lldb/test/functionalities/data-formatter/summary-string-onfail/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/main.cpp
index 03a9f278b7e..03a9f278b7e 100644
--- a/lldb/test/functionalities/data-formatter/summary-string-onfail/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/summary-string-onfail/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/synthcapping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/Makefile
diff --git a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
index 9d752f0b375..9d752f0b375 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/TestSyntheticCapping.py
diff --git a/lldb/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
index fb95ac2b54d..fb95ac2b54d 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/fooSynthProvider.py
diff --git a/lldb/test/functionalities/data-formatter/synthcapping/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/main.cpp
index b921915b91c..b921915b91c 100644
--- a/lldb/test/functionalities/data-formatter/synthcapping/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthcapping/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/synthupdate/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
index a8e1853a129..a8e1853a129 100644
--- a/lldb/test/functionalities/data-formatter/synthupdate/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/Makefile
diff --git a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
index 1add38c1767..1add38c1767 100644
--- a/lldb/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/TestSyntheticFilterRecompute.py
diff --git a/lldb/test/functionalities/data-formatter/synthupdate/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/main.m
index a7e94d29d46..a7e94d29d46 100644
--- a/lldb/test/functionalities/data-formatter/synthupdate/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/synthupdate/main.m
diff --git a/lldb/test/functionalities/data-formatter/typedef_array/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
index 3e2b0187b95..3e2b0187b95 100644
--- a/lldb/test/functionalities/data-formatter/typedef_array/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/Makefile
diff --git a/lldb/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
index 03987602184..03987602184 100644
--- a/lldb/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/TestTypedefArray.py
diff --git a/lldb/test/functionalities/data-formatter/typedef_array/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/main.cpp
index 649c1e09a6a..649c1e09a6a 100644
--- a/lldb/test/functionalities/data-formatter/typedef_array/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/typedef_array/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/Makefile
diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
index 13ea4d52335..13ea4d52335 100644
--- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/TestUserFormatVsSummary.py
diff --git a/lldb/test/functionalities/data-formatter/user-format-vs-summary/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/main.cpp
index 41c934aec0c..41c934aec0c 100644
--- a/lldb/test/functionalities/data-formatter/user-format-vs-summary/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/user-format-vs-summary/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
index 18c35a7d84a..18c35a7d84a 100644
--- a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/Makefile
diff --git a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
index 9af60fc17d7..9af60fc17d7 100644
--- a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/TestVarInAggregateMisuse.py
diff --git a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
index 72c7e138205..72c7e138205 100644
--- a/lldb/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/var-in-aggregate-misuse/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/varscript_formatting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/Makefile
diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
index bbd246a599c..bbd246a599c 100644
--- a/lldb/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/TestDataFormatterVarScriptFormatting.py
diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/helperfunc.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py
index 01562c5baa8..01562c5baa8 100644
--- a/lldb/test/functionalities/data-formatter/varscript_formatting/helperfunc.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/helperfunc.py
diff --git a/lldb/test/functionalities/data-formatter/varscript_formatting/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/main.cpp
index 4dc94af3566..4dc94af3566 100644
--- a/lldb/test/functionalities/data-formatter/varscript_formatting/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/varscript_formatting/main.cpp
diff --git a/lldb/test/functionalities/data-formatter/vector-types/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/data-formatter/vector-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/Makefile
diff --git a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
index 5399b37126b..5399b37126b 100644
--- a/lldb/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/TestVectorTypesFormatting.py
diff --git a/lldb/test/functionalities/data-formatter/vector-types/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/main.cpp
index b9d67ad20ab..b9d67ad20ab 100644
--- a/lldb/test/functionalities/data-formatter/vector-types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/data-formatter/vector-types/main.cpp
diff --git a/lldb/test/functionalities/dead-strip/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
index c60ecd41463..c60ecd41463 100644
--- a/lldb/test/functionalities/dead-strip/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile
diff --git a/lldb/test/functionalities/dead-strip/TestDeadStrip.py b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
index 8234974903a..8234974903a 100644
--- a/lldb/test/functionalities/dead-strip/TestDeadStrip.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/TestDeadStrip.py
diff --git a/lldb/test/functionalities/dead-strip/cmds.txt b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/cmds.txt
index f6fd0450288..f6fd0450288 100644
--- a/lldb/test/functionalities/dead-strip/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/cmds.txt
diff --git a/lldb/test/functionalities/dead-strip/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/main.c
index fe8e7c7de58..fe8e7c7de58 100644
--- a/lldb/test/functionalities/dead-strip/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/main.c
diff --git a/lldb/test/functionalities/disassembly/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/disassembly/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/Makefile
diff --git a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
index adf1b14dc51..adf1b14dc51 100644
--- a/lldb/test/functionalities/disassembly/TestDisassembleBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/TestDisassembleBreakpoint.py
diff --git a/lldb/test/functionalities/disassembly/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/main.cpp
index 8813647f6b7..8813647f6b7 100644
--- a/lldb/test/functionalities/disassembly/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/disassembly/main.cpp
diff --git a/lldb/test/functionalities/dynamic_value_child_count/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile
index ceb406ee2ea..ceb406ee2ea 100644
--- a/lldb/test/functionalities/dynamic_value_child_count/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/Makefile
diff --git a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
index a0f9f4d6b47..a0f9f4d6b47 100644
--- a/lldb/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/TestDynamicValueChildCount.py
diff --git a/lldb/test/functionalities/dynamic_value_child_count/pass-to-base.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/pass-to-base.cpp
index d9dd3529821..d9dd3529821 100644
--- a/lldb/test/functionalities/dynamic_value_child_count/pass-to-base.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/dynamic_value_child_count/pass-to-base.cpp
diff --git a/lldb/test/functionalities/embedded_interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/embedded_interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/Makefile
diff --git a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
index 0d6b39bdc51..0d6b39bdc51 100644
--- a/lldb/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/TestConvenienceVariables.py
diff --git a/lldb/test/functionalities/embedded_interpreter/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/main.c
index 277aa54a4ee..277aa54a4ee 100644
--- a/lldb/test/functionalities/embedded_interpreter/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/embedded_interpreter/main.c
diff --git a/lldb/test/functionalities/exec/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/exec/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/Makefile
diff --git a/lldb/test/functionalities/exec/TestExec.py b/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
index 658f1983658..658f1983658 100644
--- a/lldb/test/functionalities/exec/TestExec.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/TestExec.py
diff --git a/lldb/test/functionalities/exec/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/exec/main.cpp
index 700c5dd94b2..700c5dd94b2 100644
--- a/lldb/test/functionalities/exec/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/exec/main.cpp
diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/.categories b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/.categories
index 897e40a99dd..897e40a99dd 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/.categories
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/.categories
diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/Makefile
index a10791d5890..a10791d5890 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/Makefile
diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
index e3b8e4aa046..e3b8e4aa046 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/TestExprDoesntBlock.py
diff --git a/lldb/test/functionalities/expr-doesnt-deadlock/locking.c b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/locking.c
index fae9979611d..fae9979611d 100644
--- a/lldb/test/functionalities/expr-doesnt-deadlock/locking.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/expr-doesnt-deadlock/locking.c
diff --git a/lldb/test/functionalities/fat_archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile
index e1832fdefbe..e1832fdefbe 100644
--- a/lldb/test/functionalities/fat_archives/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/Makefile
diff --git a/lldb/test/functionalities/fat_archives/TestFatArchives.py b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
index ca721800b4d..ca721800b4d 100644
--- a/lldb/test/functionalities/fat_archives/TestFatArchives.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/TestFatArchives.py
diff --git a/lldb/test/functionalities/fat_archives/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.c
index c100f9a2c07..c100f9a2c07 100644
--- a/lldb/test/functionalities/fat_archives/a.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.c
diff --git a/lldb/test/functionalities/fat_archives/a.h b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.h
index a4536647cfc..a4536647cfc 100644
--- a/lldb/test/functionalities/fat_archives/a.h
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/a.h
diff --git a/lldb/test/functionalities/fat_archives/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/main.c
index 328319d4fb8..328319d4fb8 100644
--- a/lldb/test/functionalities/fat_archives/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/fat_archives/main.c
diff --git a/lldb/test/functionalities/format/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/format/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/format/Makefile
diff --git a/lldb/test/functionalities/format/TestFormats.py b/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
index b2e8487aa69..b2e8487aa69 100644
--- a/lldb/test/functionalities/format/TestFormats.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/format/TestFormats.py
diff --git a/lldb/test/functionalities/format/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/format/main.c
index 1dfc8ef1f3a..1dfc8ef1f3a 100644
--- a/lldb/test/functionalities/format/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/format/main.c
diff --git a/lldb/test/functionalities/inferior-assert/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/inferior-assert/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/Makefile
diff --git a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
index e5bc232caea..e5bc232caea 100644
--- a/lldb/test/functionalities/inferior-assert/TestInferiorAssert.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/TestInferiorAssert.py
diff --git a/lldb/test/functionalities/inferior-assert/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/main.c
index 6aec4c1023a..6aec4c1023a 100644
--- a/lldb/test/functionalities/inferior-assert/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-assert/main.c
diff --git a/lldb/test/functionalities/inferior-changed/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/inferior-changed/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/Makefile
diff --git a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
index daf39e6477d..daf39e6477d 100644
--- a/lldb/test/functionalities/inferior-changed/TestInferiorChanged.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/TestInferiorChanged.py
diff --git a/lldb/test/functionalities/inferior-changed/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main.c
index 9d0706a0862..9d0706a0862 100644
--- a/lldb/test/functionalities/inferior-changed/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main.c
diff --git a/lldb/test/functionalities/inferior-changed/main2.c b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main2.c
index 9173e8c30b5..9173e8c30b5 100644
--- a/lldb/test/functionalities/inferior-changed/main2.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-changed/main2.c
diff --git a/lldb/test/functionalities/inferior-crashing/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/inferior-crashing/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/Makefile
diff --git a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
index 9fe146fe71d..9fe146fe71d 100644
--- a/lldb/test/functionalities/inferior-crashing/TestInferiorCrashing.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/TestInferiorCrashing.py
diff --git a/lldb/test/functionalities/inferior-crashing/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/main.c
index 3b7cfe4012b..3b7cfe4012b 100644
--- a/lldb/test/functionalities/inferior-crashing/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/main.c
diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
index 0f8e92e9193..0f8e92e9193 100644
--- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/Makefile
diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
index 310b3d72074..310b3d72074 100644
--- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/TestRecursiveInferior.py
diff --git a/lldb/test/functionalities/inferior-crashing/recursive-inferior/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/main.c
index 25e6e8df0b9..25e6e8df0b9 100644
--- a/lldb/test/functionalities/inferior-crashing/recursive-inferior/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inferior-crashing/recursive-inferior/main.c
diff --git a/lldb/test/functionalities/inline-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
index 532f49555e5..532f49555e5 100644
--- a/lldb/test/functionalities/inline-stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/Makefile
diff --git a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
index 70d92dcca6e..70d92dcca6e 100644
--- a/lldb/test/functionalities/inline-stepping/TestInlineStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/TestInlineStepping.py
diff --git a/lldb/test/functionalities/inline-stepping/calling.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/calling.cpp
index 9982fbf4273..9982fbf4273 100644
--- a/lldb/test/functionalities/inline-stepping/calling.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/inline-stepping/calling.cpp
diff --git a/lldb/test/functionalities/jitloader_gdb/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/jitloader_gdb/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/Makefile
diff --git a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
index 2b25394afd3..2b25394afd3 100644
--- a/lldb/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/TestJITLoaderGDB.py
diff --git a/lldb/test/functionalities/jitloader_gdb/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/main.c
index 6a8ec50e663..6a8ec50e663 100644
--- a/lldb/test/functionalities/jitloader_gdb/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/jitloader_gdb/main.c
diff --git a/lldb/test/functionalities/launch_with_shellexpand/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/Makefile
diff --git a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
index 86e617f1995..86e617f1995 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/TestLaunchWithShellExpand.py
diff --git a/lldb/test/functionalities/launch_with_shellexpand/file1.txt b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file1.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/file1.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file1.txt
diff --git a/lldb/test/functionalities/launch_with_shellexpand/file2.txt b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file2.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/file2.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file2.txt
diff --git a/lldb/test/functionalities/launch_with_shellexpand/file3.txt b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file3.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/file3.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file3.txt
diff --git a/lldb/test/functionalities/launch_with_shellexpand/file4.txy b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file4.txy
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/file4.txy
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file4.txy
diff --git a/lldb/test/functionalities/launch_with_shellexpand/file5.tyx b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file5.tyx
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/file5.tyx
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/file5.tyx
diff --git a/lldb/test/functionalities/launch_with_shellexpand/foo bar b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/foo bar
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/foo bar
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/foo bar
diff --git a/lldb/test/functionalities/launch_with_shellexpand/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/main.cpp
index cbef8d1e6da..cbef8d1e6da 100644
--- a/lldb/test/functionalities/launch_with_shellexpand/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/launch_with_shellexpand/main.cpp
diff --git a/lldb/test/functionalities/load_unload/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile
index cbac629c7b5..cbac629c7b5 100644
--- a/lldb/test/functionalities/load_unload/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/Makefile
diff --git a/lldb/test/functionalities/load_unload/TestLoadUnload.py b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
index 29f6effeeff..29f6effeeff 100644
--- a/lldb/test/functionalities/load_unload/TestLoadUnload.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/TestLoadUnload.py
diff --git a/lldb/test/functionalities/load_unload/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.c
index 9d4711772dd..9d4711772dd 100644
--- a/lldb/test/functionalities/load_unload/a.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.c
diff --git a/lldb/test/functionalities/load_unload/a.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk
index a5c37561daa..a5c37561daa 100644
--- a/lldb/test/functionalities/load_unload/a.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/a.mk
diff --git a/lldb/test/functionalities/load_unload/b.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.c
index 6c629323655..6c629323655 100644
--- a/lldb/test/functionalities/load_unload/b.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.c
diff --git a/lldb/test/functionalities/load_unload/b.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk
index 956dc37cb3f..956dc37cb3f 100644
--- a/lldb/test/functionalities/load_unload/b.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/b.mk
diff --git a/lldb/test/functionalities/load_unload/c.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.c
index b1778b462d0..b1778b462d0 100644
--- a/lldb/test/functionalities/load_unload/c.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.c
diff --git a/lldb/test/functionalities/load_unload/c.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk
index ebb5ce15787..ebb5ce15787 100644
--- a/lldb/test/functionalities/load_unload/c.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/c.mk
diff --git a/lldb/test/functionalities/load_unload/cmds.txt b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/cmds.txt
index 1e4b198dc0d..1e4b198dc0d 100644
--- a/lldb/test/functionalities/load_unload/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/cmds.txt
diff --git a/lldb/test/functionalities/load_unload/d.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.c
index 6e5f0623101..6e5f0623101 100644
--- a/lldb/test/functionalities/load_unload/d.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.c
diff --git a/lldb/test/functionalities/load_unload/d.mk b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk
index 437c1507e20..437c1507e20 100644
--- a/lldb/test/functionalities/load_unload/d.mk
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/d.mk
diff --git a/lldb/test/functionalities/load_unload/hidden/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile
index 09aa39b378e..09aa39b378e 100644
--- a/lldb/test/functionalities/load_unload/hidden/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/Makefile
diff --git a/lldb/test/functionalities/load_unload/hidden/d.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/d.c
index f20aa095f2f..f20aa095f2f 100644
--- a/lldb/test/functionalities/load_unload/hidden/d.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/hidden/d.c
diff --git a/lldb/test/functionalities/load_unload/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/main.c
index bff9a317606..bff9a317606 100644
--- a/lldb/test/functionalities/load_unload/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/load_unload/main.c
diff --git a/lldb/test/functionalities/longjmp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/longjmp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/Makefile
diff --git a/lldb/test/functionalities/longjmp/TestLongjmp.py b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
index b392f7a1c7e..b392f7a1c7e 100644
--- a/lldb/test/functionalities/longjmp/TestLongjmp.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/TestLongjmp.py
diff --git a/lldb/test/functionalities/longjmp/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/main.c
index 3879311eb45..3879311eb45 100644
--- a/lldb/test/functionalities/longjmp/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/longjmp/main.c
diff --git a/lldb/test/functionalities/memory/read/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/functionalities/memory/read/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/Makefile
diff --git a/lldb/test/functionalities/memory/read/TestMemoryRead.py b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
index 085c9bdd989..085c9bdd989 100644
--- a/lldb/test/functionalities/memory/read/TestMemoryRead.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/TestMemoryRead.py
diff --git a/lldb/test/functionalities/memory/read/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/main.cpp
index b4d7809d27c..b4d7809d27c 100644
--- a/lldb/test/functionalities/memory/read/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/memory/read/main.cpp
diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/non-overlapping-index-variable-i/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/Makefile
diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
index 9ff01abd974..9ff01abd974 100644
--- a/lldb/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/TestIndexVariable.py
diff --git a/lldb/test/functionalities/non-overlapping-index-variable-i/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp
index b4f519cd25a..b4f519cd25a 100644
--- a/lldb/test/functionalities/non-overlapping-index-variable-i/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/non-overlapping-index-variable-i/main.cpp
diff --git a/lldb/test/functionalities/nosucharch/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/nosucharch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/Makefile
diff --git a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
index f1ca5d54ae1..f1ca5d54ae1 100644
--- a/lldb/test/functionalities/nosucharch/TestNoSuchArch.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/TestNoSuchArch.py
diff --git a/lldb/test/functionalities/nosucharch/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/main.cpp
index 4cce7f667ff..4cce7f667ff 100644
--- a/lldb/test/functionalities/nosucharch/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/nosucharch/main.cpp
diff --git a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
index 56489529d2e..56489529d2e 100644
--- a/lldb/test/functionalities/object-file/TestImageListMultiArchitecture.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/TestImageListMultiArchitecture.py
diff --git a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3
index cea323639b4..cea323639b4 100755..100644
--- a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-clang-3.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3
index 38f43f8acb9..38f43f8acb9 100755..100644
--- a/lldb/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-freebsd-10.0-x86_64-gcc-4.7.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3
index 6d531320ae9..6d531320ae9 100755..100644
--- a/lldb/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-netbsd-6.1-x86_64-gcc-4.5.3
diff --git a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre
index 8bdcf4d5b59..8bdcf4d5b59 100755..100644
--- a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-clang-3.5pre
diff --git a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2
index 01efbb061b7..01efbb061b7 100755..100644
--- a/lldb/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-ubuntu-14.04-x86_64-gcc-4.8.2
diff --git a/lldb/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36
index 8e4dd8c883c..8e4dd8c883c 100644
--- a/lldb/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch4-kcc-36
diff --git a/lldb/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39 b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39
index f80268a08e5..f80268a08e5 100644
--- a/lldb/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello-unknown-kalimba_arch5-kcc-39
diff --git a/lldb/test/functionalities/object-file/bin/hello.c b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.c
index 8c804005afe..8c804005afe 100644
--- a/lldb/test/functionalities/object-file/bin/hello.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.c
diff --git a/lldb/test/functionalities/object-file/bin/hello.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.cpp
index 8c804005afe..8c804005afe 100644
--- a/lldb/test/functionalities/object-file/bin/hello.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/object-file/bin/hello.cpp
diff --git a/lldb/test/functionalities/paths/TestPaths.py b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
index d001834b022..d001834b022 100644
--- a/lldb/test/functionalities/paths/TestPaths.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/paths/TestPaths.py
diff --git a/lldb/test/functionalities/platform/TestPlatformCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
index 6333fdcffc2..6333fdcffc2 100644
--- a/lldb/test/functionalities/platform/TestPlatformCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/platform/TestPlatformCommand.py
diff --git a/lldb/test/functionalities/plugins/commands/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/Makefile
index 8af06446ece..8af06446ece 100644
--- a/lldb/test/functionalities/plugins/commands/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/Makefile
diff --git a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
index e5a9581c881..e5a9581c881 100644
--- a/lldb/test/functionalities/plugins/commands/TestPluginCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/TestPluginCommands.py
diff --git a/lldb/test/functionalities/plugins/commands/plugin.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
index be3d29325de..be3d29325de 100644
--- a/lldb/test/functionalities/plugins/commands/plugin.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/commands/plugin.cpp
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile
index cd9ca5c86d8..cd9ca5c86d8 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/Makefile
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
index d7ccfa3e6f5..d7ccfa3e6f5 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/TestPythonOSPlugin.py
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/main.c
index faa6dd58ecd..faa6dd58ecd 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/main.c
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/operating_system.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py
index 536092e40b3..536092e40b3 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/operating_system.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system.py
diff --git a/lldb/test/functionalities/plugins/python_os_plugin/operating_system2.py b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py
index 7a9435d44ed..7a9435d44ed 100644
--- a/lldb/test/functionalities/plugins/python_os_plugin/operating_system2.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/python_os_plugin/operating_system2.py
diff --git a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
index 46dbb1d59df..46dbb1d59df 100644
--- a/lldb/test/functionalities/postmortem/minidump/TestMiniDump.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/TestMiniDump.py
diff --git a/lldb/test/functionalities/postmortem/minidump/fizzbuzz.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.cpp
index eb6476bfd9a..eb6476bfd9a 100644
--- a/lldb/test/functionalities/postmortem/minidump/fizzbuzz.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz.cpp
diff --git a/lldb/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp
index 19008c91fc3..19008c91fc3 100644
--- a/lldb/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/postmortem/minidump/fizzbuzz_no_heap.dmp
diff --git a/lldb/test/functionalities/process_attach/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/Makefile
index a964853f534..a964853f534 100644
--- a/lldb/test/functionalities/process_attach/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/Makefile
diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
index d08dda21c27..d08dda21c27 100644
--- a/lldb/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
diff --git a/lldb/test/functionalities/process_attach/attach_denied/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/Makefile
index 87600bbccf9..87600bbccf9 100644
--- a/lldb/test/functionalities/process_attach/attach_denied/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/Makefile
diff --git a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
index e600b53de9c..e600b53de9c 100644
--- a/lldb/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/TestAttachDenied.py
diff --git a/lldb/test/functionalities/process_attach/attach_denied/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/main.cpp
index ff1fccae4b1..ff1fccae4b1 100644
--- a/lldb/test/functionalities/process_attach/attach_denied/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/attach_denied/main.cpp
diff --git a/lldb/test/functionalities/process_attach/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/main.cpp
index 8021feac5c7..8021feac5c7 100644
--- a/lldb/test/functionalities/process_attach/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/main.cpp
diff --git a/lldb/test/functionalities/process_group/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/process_group/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/Makefile
diff --git a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
index 8779e5e84da..8779e5e84da 100644
--- a/lldb/test/functionalities/process_group/TestChangeProcessGroup.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/TestChangeProcessGroup.py
diff --git a/lldb/test/functionalities/process_group/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/main.c
index c730c629e8b..c730c629e8b 100644
--- a/lldb/test/functionalities/process_group/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_group/main.c
diff --git a/lldb/test/functionalities/process_launch/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/Makefile
index 313da706b4a..313da706b4a 100644
--- a/lldb/test/functionalities/process_launch/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/Makefile
diff --git a/lldb/test/functionalities/process_launch/TestProcessLaunch.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
index 41aee665b87..41aee665b87 100644
--- a/lldb/test/functionalities/process_launch/TestProcessLaunch.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/TestProcessLaunch.py
diff --git a/lldb/test/functionalities/process_launch/input-file.txt b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/input-file.txt
index cc269ba0ff8..cc269ba0ff8 100644
--- a/lldb/test/functionalities/process_launch/input-file.txt
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/input-file.txt
diff --git a/lldb/test/functionalities/process_launch/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/main.cpp
index f2035d55167..f2035d55167 100644
--- a/lldb/test/functionalities/process_launch/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/main.cpp
diff --git a/lldb/test/functionalities/process_launch/my_working_dir/.keep b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/my_working_dir/.keep
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/process_launch/my_working_dir/.keep
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/my_working_dir/.keep
diff --git a/lldb/test/functionalities/process_launch/print_cwd.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_cwd.cpp
index b4b073fbcb8..b4b073fbcb8 100644
--- a/lldb/test/functionalities/process_launch/print_cwd.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_launch/print_cwd.cpp
diff --git a/lldb/test/functionalities/recursion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/recursion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/Makefile
diff --git a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
index 9d33da66180..9d33da66180 100644
--- a/lldb/test/functionalities/recursion/TestValueObjectRecursion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/TestValueObjectRecursion.py
diff --git a/lldb/test/functionalities/recursion/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/main.cpp
index f75a7f8698b..f75a7f8698b 100644
--- a/lldb/test/functionalities/recursion/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/recursion/main.cpp
diff --git a/lldb/test/functionalities/register/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/register/Makefile
index 7144b25c58c..7144b25c58c 100755..100644
--- a/lldb/test/functionalities/register/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/register/Makefile
diff --git a/lldb/test/functionalities/register/TestRegisters.py b/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
index 5c07c5eb741..5c07c5eb741 100755..100644
--- a/lldb/test/functionalities/register/TestRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/register/TestRegisters.py
diff --git a/lldb/test/functionalities/register/a.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/register/a.cpp
index b659a53f09f..b659a53f09f 100755..100644
--- a/lldb/test/functionalities/register/a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/register/a.cpp
diff --git a/lldb/test/functionalities/register/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/register/main.cpp
index 876dd0833e5..876dd0833e5 100755..100644
--- a/lldb/test/functionalities/register/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/register/main.cpp
diff --git a/lldb/test/functionalities/rerun/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/rerun/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/Makefile
diff --git a/lldb/test/functionalities/rerun/TestRerun.py b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
index 0058e24a2be..0058e24a2be 100644
--- a/lldb/test/functionalities/rerun/TestRerun.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/TestRerun.py
diff --git a/lldb/test/functionalities/rerun/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/main.cpp
index cbef8d1e6da..cbef8d1e6da 100644
--- a/lldb/test/functionalities/rerun/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/rerun/main.cpp
diff --git a/lldb/test/functionalities/return-value/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile
index cb03eabfc27..cb03eabfc27 100644
--- a/lldb/test/functionalities/return-value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/Makefile
diff --git a/lldb/test/functionalities/return-value/TestReturnValue.py b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
index 88285b762dc..88285b762dc 100644
--- a/lldb/test/functionalities/return-value/TestReturnValue.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/TestReturnValue.py
diff --git a/lldb/test/functionalities/return-value/call-func.c b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/call-func.c
index 0c026ffcca1..0c026ffcca1 100644
--- a/lldb/test/functionalities/return-value/call-func.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/return-value/call-func.c
diff --git a/lldb/test/functionalities/set-data/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
index 9e1d63a183b..9e1d63a183b 100644
--- a/lldb/test/functionalities/set-data/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/Makefile
diff --git a/lldb/test/functionalities/set-data/TestSetData.py b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
index 720dae003e4..720dae003e4 100644
--- a/lldb/test/functionalities/set-data/TestSetData.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/TestSetData.py
diff --git a/lldb/test/functionalities/set-data/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/main.m
index e1e69dc5571..e1e69dc5571 100644
--- a/lldb/test/functionalities/set-data/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/set-data/main.m
diff --git a/lldb/test/functionalities/signal/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/signal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/Makefile
diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
index 7ae62bc2014..7ae62bc2014 100644
--- a/lldb/test/functionalities/signal/TestSendSignal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/TestSendSignal.py
diff --git a/lldb/test/functionalities/signal/handle-segv/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/signal/handle-segv/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/Makefile
diff --git a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
index c60656a3c60..c60656a3c60 100644
--- a/lldb/test/functionalities/signal/handle-segv/TestHandleSegv.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/TestHandleSegv.py
diff --git a/lldb/test/functionalities/signal/handle-segv/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/main.c
index 27d9b8e500a..27d9b8e500a 100644
--- a/lldb/test/functionalities/signal/handle-segv/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/handle-segv/main.c
diff --git a/lldb/test/functionalities/signal/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/signal/main.c
index 77e76050341..77e76050341 100644
--- a/lldb/test/functionalities/signal/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/main.c
diff --git a/lldb/test/functionalities/signal/raise/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/signal/raise/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/Makefile
diff --git a/lldb/test/functionalities/signal/raise/TestRaise.py b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
index fe9077c0626..fe9077c0626 100644
--- a/lldb/test/functionalities/signal/raise/TestRaise.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/TestRaise.py
diff --git a/lldb/test/functionalities/signal/raise/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/main.c
index 8827174e758..8827174e758 100644
--- a/lldb/test/functionalities/signal/raise/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/signal/raise/main.c
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/Makefile
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
index b79645f7908..b79645f7908 100644
--- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/TestSingleQuoteInFilename.py
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/main.c
index 7cee7306547..7cee7306547 100644
--- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/main.c
diff --git a/lldb/test/functionalities/single-quote-in-filename-to-lldb/path with '09/.keep b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/path with '09/.keep
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/functionalities/single-quote-in-filename-to-lldb/path with '09/.keep
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/single-quote-in-filename-to-lldb/path with '09/.keep
diff --git a/lldb/test/functionalities/step-avoids-no-debug/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile
index 45b69a5bb6e..45b69a5bb6e 100644
--- a/lldb/test/functionalities/step-avoids-no-debug/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/Makefile
diff --git a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
index 9087df6afec..9087df6afec 100644
--- a/lldb/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/TestStepNoDebug.py
diff --git a/lldb/test/functionalities/step-avoids-no-debug/with-debug.c b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/with-debug.c
index c7ac309d2c1..c7ac309d2c1 100644
--- a/lldb/test/functionalities/step-avoids-no-debug/with-debug.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/with-debug.c
diff --git a/lldb/test/functionalities/step-avoids-no-debug/without-debug.c b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/without-debug.c
index d71d74af5e9..d71d74af5e9 100644
--- a/lldb/test/functionalities/step-avoids-no-debug/without-debug.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/step-avoids-no-debug/without-debug.c
diff --git a/lldb/test/functionalities/stop-hook/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/stop-hook/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/Makefile
diff --git a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
index 37ad2c24d38..37ad2c24d38 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookCmd.py
diff --git a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
index 89b9121643a..89b9121643a 100644
--- a/lldb/test/functionalities/stop-hook/TestStopHookMechanism.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/TestStopHookMechanism.py
diff --git a/lldb/test/functionalities/stop-hook/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/main.cpp
index c10c1e5ef0d..c10c1e5ef0d 100644
--- a/lldb/test/functionalities/stop-hook/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/main.cpp
diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile
index b5d93fb1166..b5d93fb1166 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/Makefile
diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
index f38f7a598fc..f38f7a598fc 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/TestStopHookMultipleThreads.py
diff --git a/lldb/test/functionalities/stop-hook/multiple_threads/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/main.cpp
index e193ae18e2c..e193ae18e2c 100644
--- a/lldb/test/functionalities/stop-hook/multiple_threads/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/stop-hook/multiple_threads/main.cpp
diff --git a/lldb/test/functionalities/target_command/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/Makefile
index 9117ab9388b..9117ab9388b 100644
--- a/lldb/test/functionalities/target_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/Makefile
diff --git a/lldb/test/functionalities/target_command/TestTargetCommand.py b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
index 7ffc64c3667..7ffc64c3667 100644
--- a/lldb/test/functionalities/target_command/TestTargetCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/TestTargetCommand.py
diff --git a/lldb/test/functionalities/target_command/a.c b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/a.c
index 9d0706a0862..9d0706a0862 100644
--- a/lldb/test/functionalities/target_command/a.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/a.c
diff --git a/lldb/test/functionalities/target_command/b.c b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/b.c
index 62ec97f4328..62ec97f4328 100644
--- a/lldb/test/functionalities/target_command/b.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/b.c
diff --git a/lldb/test/functionalities/target_command/c.c b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/c.c
index 7c362cc437a..7c362cc437a 100644
--- a/lldb/test/functionalities/target_command/c.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/c.c
diff --git a/lldb/test/functionalities/target_command/globals.c b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/globals.c
index 6902bc41568..6902bc41568 100644
--- a/lldb/test/functionalities/target_command/globals.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/target_command/globals.c
diff --git a/lldb/test/functionalities/thread/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/Makefile
index 6f51b234440..6f51b234440 100644
--- a/lldb/test/functionalities/thread/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/Makefile
diff --git a/lldb/test/functionalities/thread/TestNumThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
index 28d51813644..28d51813644 100644
--- a/lldb/test/functionalities/thread/TestNumThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/TestNumThreads.py
diff --git a/lldb/test/functionalities/thread/break_after_join/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
index 85080d5b9a4..85080d5b9a4 100644
--- a/lldb/test/functionalities/thread/break_after_join/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/Makefile
diff --git a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
index cf12693c7b5..cf12693c7b5 100644
--- a/lldb/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/TestBreakAfterJoin.py
diff --git a/lldb/test/functionalities/thread/break_after_join/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/main.cpp
index a63079524ee..a63079524ee 100644
--- a/lldb/test/functionalities/thread/break_after_join/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/break_after_join/main.cpp
diff --git a/lldb/test/functionalities/thread/concurrent_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile
index 469c0809aa2..469c0809aa2 100644
--- a/lldb/test/functionalities/thread/concurrent_events/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/Makefile
diff --git a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
index 80ebb7c6e13..80ebb7c6e13 100644
--- a/lldb/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentEvents.py
diff --git a/lldb/test/functionalities/thread/concurrent_events/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/main.cpp
index ac2535cd2bf..ac2535cd2bf 100644
--- a/lldb/test/functionalities/thread/concurrent_events/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/main.cpp
diff --git a/lldb/test/functionalities/thread/crash_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile
index 26db4816b6e..26db4816b6e 100644
--- a/lldb/test/functionalities/thread/crash_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/Makefile
diff --git a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
index e2fce436473..e2fce436473 100644
--- a/lldb/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/TestCrashDuringStep.py
diff --git a/lldb/test/functionalities/thread/crash_during_step/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/main.cpp
index 02f3ce33822..02f3ce33822 100644
--- a/lldb/test/functionalities/thread/crash_during_step/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/crash_during_step/main.cpp
diff --git a/lldb/test/functionalities/thread/create_after_attach/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
index 30c1547e35b..30c1547e35b 100644
--- a/lldb/test/functionalities/thread/create_after_attach/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/Makefile
diff --git a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
index 6e363a3ffe6..6e363a3ffe6 100644
--- a/lldb/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/TestCreateAfterAttach.py
diff --git a/lldb/test/functionalities/thread/create_after_attach/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/main.cpp
index 8434458f064..8434458f064 100644
--- a/lldb/test/functionalities/thread/create_after_attach/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_after_attach/main.cpp
diff --git a/lldb/test/functionalities/thread/create_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile
index 67aa16625bf..67aa16625bf 100644
--- a/lldb/test/functionalities/thread/create_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/Makefile
diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
index 0267f2e4776..0267f2e4776 100644
--- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
diff --git a/lldb/test/functionalities/thread/create_during_step/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/main.cpp
index 3a00248c022..3a00248c022 100644
--- a/lldb/test/functionalities/thread/create_during_step/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/create_during_step/main.cpp
diff --git a/lldb/test/functionalities/thread/exit_during_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile
index 67aa16625bf..67aa16625bf 100644
--- a/lldb/test/functionalities/thread/exit_during_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/Makefile
diff --git a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
index 261c524c9de..261c524c9de 100644
--- a/lldb/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/TestExitDuringBreak.py
diff --git a/lldb/test/functionalities/thread/exit_during_break/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/main.cpp
index 3570637207d..3570637207d 100644
--- a/lldb/test/functionalities/thread/exit_during_break/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_break/main.cpp
diff --git a/lldb/test/functionalities/thread/exit_during_step/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile
index d06a7d4685f..d06a7d4685f 100644
--- a/lldb/test/functionalities/thread/exit_during_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/Makefile
diff --git a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
index d5e83dc4be3..d5e83dc4be3 100644
--- a/lldb/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/TestExitDuringStep.py
diff --git a/lldb/test/functionalities/thread/exit_during_step/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/main.cpp
index d1b364b8baa..d1b364b8baa 100644
--- a/lldb/test/functionalities/thread/exit_during_step/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/exit_during_step/main.cpp
diff --git a/lldb/test/functionalities/thread/jump/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile
index b726fc3695f..b726fc3695f 100644
--- a/lldb/test/functionalities/thread/jump/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/Makefile
diff --git a/lldb/test/functionalities/thread/jump/TestThreadJump.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
index 1c0b32dc6d9..1c0b32dc6d9 100644
--- a/lldb/test/functionalities/thread/jump/TestThreadJump.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/TestThreadJump.py
diff --git a/lldb/test/functionalities/thread/jump/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/main.cpp
index 3497155a98f..3497155a98f 100644
--- a/lldb/test/functionalities/thread/jump/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/main.cpp
diff --git a/lldb/test/functionalities/thread/jump/other.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/other.cpp
index 8108a52c163..8108a52c163 100644
--- a/lldb/test/functionalities/thread/jump/other.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/jump/other.cpp
diff --git a/lldb/test/functionalities/thread/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
index 6a0ea4e0d11..6a0ea4e0d11 100644
--- a/lldb/test/functionalities/thread/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/main.cpp
diff --git a/lldb/test/functionalities/thread/multi_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile
index 67aa16625bf..67aa16625bf 100644
--- a/lldb/test/functionalities/thread/multi_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/Makefile
diff --git a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
index fc81fa98c73..fc81fa98c73 100644
--- a/lldb/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/TestMultipleBreakpoints.py
diff --git a/lldb/test/functionalities/thread/multi_break/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/main.cpp
index 01f4b8f98ea..01f4b8f98ea 100644
--- a/lldb/test/functionalities/thread/multi_break/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/multi_break/main.cpp
diff --git a/lldb/test/functionalities/thread/state/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile
index 26db4816b6e..26db4816b6e 100644
--- a/lldb/test/functionalities/thread/state/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/Makefile
diff --git a/lldb/test/functionalities/thread/state/TestThreadStates.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
index dc20507ad87..dc20507ad87 100644
--- a/lldb/test/functionalities/thread/state/TestThreadStates.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
diff --git a/lldb/test/functionalities/thread/state/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/main.cpp
index 081203da8da..081203da8da 100644
--- a/lldb/test/functionalities/thread/state/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/state/main.cpp
diff --git a/lldb/test/functionalities/thread/step_out/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile
index 035413ff763..035413ff763 100644
--- a/lldb/test/functionalities/thread/step_out/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/Makefile
diff --git a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
index 7ef1460d2f5..7ef1460d2f5 100644
--- a/lldb/test/functionalities/thread/step_out/TestThreadStepOut.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/TestThreadStepOut.py
diff --git a/lldb/test/functionalities/thread/step_out/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp
index b4c6216d6bf..b4c6216d6bf 100644
--- a/lldb/test/functionalities/thread/step_out/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/step_out/main.cpp
diff --git a/lldb/test/functionalities/thread/thread_exit/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile
index d06a7d4685f..d06a7d4685f 100644
--- a/lldb/test/functionalities/thread/thread_exit/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/Makefile
diff --git a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
index 89f65f9b505..89f65f9b505 100644
--- a/lldb/test/functionalities/thread/thread_exit/TestThreadExit.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/TestThreadExit.py
diff --git a/lldb/test/functionalities/thread/thread_exit/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/main.cpp
index e498db7895d..e498db7895d 100644
--- a/lldb/test/functionalities/thread/thread_exit/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_exit/main.cpp
diff --git a/lldb/test/functionalities/thread/thread_specific_break/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile
index 035413ff763..035413ff763 100644
--- a/lldb/test/functionalities/thread/thread_specific_break/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/Makefile
diff --git a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
index 29d3c489b2b..29d3c489b2b 100644
--- a/lldb/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/TestThreadSpecificBreakpoint.py
diff --git a/lldb/test/functionalities/thread/thread_specific_break/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/main.cpp
index af8ab84157f..af8ab84157f 100644
--- a/lldb/test/functionalities/thread/thread_specific_break/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/thread_specific_break/main.cpp
diff --git a/lldb/test/functionalities/tty/TestTerminal.py b/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
index 6cfc4246273..6cfc4246273 100644
--- a/lldb/test/functionalities/tty/TestTerminal.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/tty/TestTerminal.py
diff --git a/lldb/test/functionalities/type_completion/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile
index b69775dc199..b69775dc199 100644
--- a/lldb/test/functionalities/type_completion/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/Makefile
diff --git a/lldb/test/functionalities/type_completion/TestTypeCompletion.py b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
index 9c2b33ffbb7..9c2b33ffbb7 100644
--- a/lldb/test/functionalities/type_completion/TestTypeCompletion.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/TestTypeCompletion.py
diff --git a/lldb/test/functionalities/type_completion/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/main.cpp
index 80329737928..80329737928 100644
--- a/lldb/test/functionalities/type_completion/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_completion/main.cpp
diff --git a/lldb/test/functionalities/type_lookup/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
index 31e57fe28a5..31e57fe28a5 100644
--- a/lldb/test/functionalities/type_lookup/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/Makefile
diff --git a/lldb/test/functionalities/type_lookup/TestTypeLookup.py b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
index e50b323394e..e50b323394e 100644
--- a/lldb/test/functionalities/type_lookup/TestTypeLookup.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/TestTypeLookup.py
diff --git a/lldb/test/functionalities/type_lookup/main.m b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/main.m
index 058a0c00e92..058a0c00e92 100644
--- a/lldb/test/functionalities/type_lookup/main.m
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/type_lookup/main.m
diff --git a/lldb/test/functionalities/unwind/noreturn/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile
index ede25f029bc..ede25f029bc 100644
--- a/lldb/test/functionalities/unwind/noreturn/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/Makefile
diff --git a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
index 0a85c59b9f4..0a85c59b9f4 100644
--- a/lldb/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/TestNoreturnUnwind.py
diff --git a/lldb/test/functionalities/unwind/noreturn/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/main.c
index 7190e38f5d8..7190e38f5d8 100644
--- a/lldb/test/functionalities/unwind/noreturn/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/noreturn/main.c
diff --git a/lldb/test/functionalities/unwind/sigtramp/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/unwind/sigtramp/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/Makefile
diff --git a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
index 6f8412c93d6..6f8412c93d6 100644
--- a/lldb/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/TestSigtrampUnwind.py
diff --git a/lldb/test/functionalities/unwind/sigtramp/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/main.c
index aaa03e7aa84..aaa03e7aa84 100644
--- a/lldb/test/functionalities/unwind/sigtramp/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/sigtramp/main.c
diff --git a/lldb/test/functionalities/unwind/standard/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile
index 146da30b12c..146da30b12c 100644
--- a/lldb/test/functionalities/unwind/standard/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/Makefile
diff --git a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
index 7b7cf41c577..7b7cf41c577 100644
--- a/lldb/test/functionalities/unwind/standard/TestStandardUnwind.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/TestStandardUnwind.py
diff --git a/lldb/test/functionalities/unwind/standard/hand_written/divmod.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/divmod.cpp
index 75df6ba8937..75df6ba8937 100644
--- a/lldb/test/functionalities/unwind/standard/hand_written/divmod.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/divmod.cpp
diff --git a/lldb/test/functionalities/unwind/standard/hand_written/fprintf.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/fprintf.cpp
index 188738cb9ba..188738cb9ba 100644
--- a/lldb/test/functionalities/unwind/standard/hand_written/fprintf.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/fprintf.cpp
diff --git a/lldb/test/functionalities/unwind/standard/hand_written/new_delete.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/new_delete.cpp
index d240b89e50a..d240b89e50a 100644
--- a/lldb/test/functionalities/unwind/standard/hand_written/new_delete.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/unwind/standard/hand_written/new_delete.cpp
diff --git a/lldb/test/functionalities/value_md5_crash/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/functionalities/value_md5_crash/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/Makefile
diff --git a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
index 98733e5379a..98733e5379a 100644
--- a/lldb/test/functionalities/value_md5_crash/TestValueMD5Crash.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/TestValueMD5Crash.py
diff --git a/lldb/test/functionalities/value_md5_crash/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/main.cpp
index ba596b8653c..ba596b8653c 100644
--- a/lldb/test/functionalities/value_md5_crash/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/value_md5_crash/main.cpp
diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
index 7fef897c059..7fef897c059 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/Makefile
diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
index 8b9da4eae1f..8b9da4eae1f 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/TestWatchLocation.py
diff --git a/lldb/test/functionalities/watchpoint/hello_watchlocation/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/main.cpp
index 59b0afc6d5f..59b0afc6d5f 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchlocation/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchlocation/main.cpp
diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/Makefile
diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
index 87c2e20c499..87c2e20c499 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/TestMyFirstWatchpoint.py
diff --git a/lldb/test/functionalities/watchpoint/hello_watchpoint/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/main.c
index 11a738a0de4..11a738a0de4 100644
--- a/lldb/test/functionalities/watchpoint/hello_watchpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/hello_watchpoint/main.c
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
index 7fef897c059..7fef897c059 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/Makefile
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
index b615fc77e21..b615fc77e21 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/main.cpp
index 8a31041f8fc..8a31041f8fc 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/multiple_threads/main.cpp
diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/Makefile
diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
index a9d706f105b..a9d706f105b 100644
--- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/TestStepOverWatchpoint.py
diff --git a/lldb/test/functionalities/watchpoint/step_over_watchpoint/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/main.c
index 2d87d9a2f73..2d87d9a2f73 100644
--- a/lldb/test/functionalities/watchpoint/step_over_watchpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/step_over_watchpoint/main.c
diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/Makefile
diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
index 0c781bf73ef..0c781bf73ef 100644
--- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/TestWatchedVarHitWhenInScope.py
diff --git a/lldb/test/functionalities/watchpoint/variable_out_of_scope/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/main.c
index 1bf7a00ac83..1bf7a00ac83 100644
--- a/lldb/test/functionalities/watchpoint/variable_out_of_scope/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/variable_out_of_scope/main.c
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
index 43ddf847f2b..43ddf847f2b 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/TestWatchpointCommands.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/Makefile
index ee6b9cc62b4..ee6b9cc62b4 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
index fc359efa729..fc359efa729 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandLLDB.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
index d6af0c2f229..d6af0c2f229 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/TestWatchpointCommandPython.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp
index 6cb80c62217..6cb80c62217 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/command/main.cpp
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile
index ee6b9cc62b4..ee6b9cc62b4 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
index eddef4c1446..eddef4c1446 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/TestWatchpointConditionCmd.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp
index f4c3527f8af..f4c3527f8af 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/condition/main.cpp
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_commands/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/main.c
index b20eaf494fb..b20eaf494fb 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_commands/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_commands/main.c
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_events/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
index c19ee8f99ac..c19ee8f99ac 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/TestWatchpointEvents.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_events/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/main.c
index 4b917536a16..4b917536a16 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_events/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_events/main.c
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
index d6e5826c130..d6e5826c130 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/TestValueOfVectorVariable.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/main.c b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/main.c
index 98f8c477eb3..98f8c477eb3 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_on_vectors/main.c
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_on_vectors/main.c
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
index 7fef897c059..7fef897c059 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/Makefile
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
index 3ad93702661..3ad93702661 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchLocationWithWatchSet.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
index aac278b1cf0..aac278b1cf0 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/TestWatchpointSetErrorCases.py
diff --git a/lldb/test/functionalities/watchpoint/watchpoint_set_command/main.cpp b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/main.cpp
index 796c0ef359d..796c0ef359d 100644
--- a/lldb/test/functionalities/watchpoint/watchpoint_set_command/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/watchpoint/watchpoint_set_command/main.cpp
diff --git a/lldb/test/help/TestHelp.py b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
index 90aa2c90b29..90aa2c90b29 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/packages/Python/lldbsuite/test/help/TestHelp.py
diff --git a/lldb/test/lang/c/anonymous/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/anonymous/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/Makefile
diff --git a/lldb/test/lang/c/anonymous/TestAnonymous.py b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
index 539cb94caa5..539cb94caa5 100644
--- a/lldb/test/lang/c/anonymous/TestAnonymous.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/TestAnonymous.py
diff --git a/lldb/test/lang/c/anonymous/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/main.c
index 58ac85b7d43..58ac85b7d43 100644
--- a/lldb/test/lang/c/anonymous/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/anonymous/main.c
diff --git a/lldb/test/lang/c/array_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/array_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/Makefile
diff --git a/lldb/test/lang/c/array_types/TestArrayTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
index ecfe0c26980..ecfe0c26980 100644
--- a/lldb/test/lang/c/array_types/TestArrayTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/TestArrayTypes.py
diff --git a/lldb/test/lang/c/array_types/cmds.txt b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/cmds.txt
index 8feebe21204..8feebe21204 100644
--- a/lldb/test/lang/c/array_types/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/cmds.txt
diff --git a/lldb/test/lang/c/array_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c
index 5f0680a43b8..5f0680a43b8 100644
--- a/lldb/test/lang/c/array_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/array_types/main.c
diff --git a/lldb/test/lang/c/bitfields/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/bitfields/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/Makefile
diff --git a/lldb/test/lang/c/bitfields/TestBitfields.py b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
index b9ae8a51ae6..b9ae8a51ae6 100644
--- a/lldb/test/lang/c/bitfields/TestBitfields.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/TestBitfields.py
diff --git a/lldb/test/lang/c/bitfields/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c
index 26c0176d759..26c0176d759 100644
--- a/lldb/test/lang/c/bitfields/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/bitfields/main.c
diff --git a/lldb/test/lang/c/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile
index 752b7aed397..752b7aed397 100644
--- a/lldb/test/lang/c/blocks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/Makefile
diff --git a/lldb/test/lang/c/blocks/TestBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
index fb32bf3e38d..fb32bf3e38d 100644
--- a/lldb/test/lang/c/blocks/TestBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/TestBlocks.py
diff --git a/lldb/test/lang/c/blocks/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/main.c
index 415e6c6d033..415e6c6d033 100644
--- a/lldb/test/lang/c/blocks/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/blocks/main.c
diff --git a/lldb/test/lang/c/const_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile
index 51adad1d062..51adad1d062 100644
--- a/lldb/test/lang/c/const_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/Makefile
diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
index a0471cc5704..a0471cc5704 100644
--- a/lldb/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/TestConstVariables.py
diff --git a/lldb/test/lang/c/const_variables/functions.c b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/functions.c
index c9ea63837c8..c9ea63837c8 100644
--- a/lldb/test/lang/c/const_variables/functions.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/functions.c
diff --git a/lldb/test/lang/c/const_variables/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/main.c
index 086fa6f0fab..086fa6f0fab 100644
--- a/lldb/test/lang/c/const_variables/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/const_variables/main.c
diff --git a/lldb/test/lang/c/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/enum_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/Makefile
diff --git a/lldb/test/lang/c/enum_types/TestEnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
index 46355a978e6..46355a978e6 100644
--- a/lldb/test/lang/c/enum_types/TestEnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/TestEnumTypes.py
diff --git a/lldb/test/lang/c/enum_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c
index 3d59654eff6..3d59654eff6 100644
--- a/lldb/test/lang/c/enum_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/enum_types/main.c
diff --git a/lldb/test/lang/c/forward/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile
index 1db43ab479b..1db43ab479b 100644
--- a/lldb/test/lang/c/forward/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/Makefile
diff --git a/lldb/test/lang/c/forward/README.txt b/lldb/packages/Python/lldbsuite/test/lang/c/forward/README.txt
index b7b66f75162..b7b66f75162 100644
--- a/lldb/test/lang/c/forward/README.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/README.txt
diff --git a/lldb/test/lang/c/forward/TestForwardDeclaration.py b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
index 05868597eec..05868597eec 100644
--- a/lldb/test/lang/c/forward/TestForwardDeclaration.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/TestForwardDeclaration.py
diff --git a/lldb/test/lang/c/forward/foo.c b/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.c
index 2e050e77778..2e050e77778 100644
--- a/lldb/test/lang/c/forward/foo.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.c
diff --git a/lldb/test/lang/c/forward/foo.h b/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.h
index 3040927cb47..3040927cb47 100644
--- a/lldb/test/lang/c/forward/foo.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/foo.h
diff --git a/lldb/test/lang/c/forward/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/forward/main.c
index 6f9787c30a3..6f9787c30a3 100644
--- a/lldb/test/lang/c/forward/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/forward/main.c
diff --git a/lldb/test/lang/c/function_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/function_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/Makefile
diff --git a/lldb/test/lang/c/function_types/TestFunctionTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
index 85a97d4a298..85a97d4a298 100644
--- a/lldb/test/lang/c/function_types/TestFunctionTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/TestFunctionTypes.py
diff --git a/lldb/test/lang/c/function_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c
index 8be3c4d46b3..8be3c4d46b3 100644
--- a/lldb/test/lang/c/function_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/function_types/main.c
diff --git a/lldb/test/lang/c/global_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile
index b1b77dacc01..b1b77dacc01 100644
--- a/lldb/test/lang/c/global_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/Makefile
diff --git a/lldb/test/lang/c/global_variables/TestGlobalVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
index b75ef4fa38d..b75ef4fa38d 100644
--- a/lldb/test/lang/c/global_variables/TestGlobalVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/TestGlobalVariables.py
diff --git a/lldb/test/lang/c/global_variables/a.c b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c
index d169d5d6324..d169d5d6324 100644
--- a/lldb/test/lang/c/global_variables/a.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/a.c
diff --git a/lldb/test/lang/c/global_variables/cmds.txt b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/cmds.txt
index 6906a0729ae..6906a0729ae 100644
--- a/lldb/test/lang/c/global_variables/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/cmds.txt
diff --git a/lldb/test/lang/c/global_variables/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c
index d0ac6a9534f..d0ac6a9534f 100644
--- a/lldb/test/lang/c/global_variables/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/global_variables/main.c
diff --git a/lldb/test/lang/c/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/Makefile
index c5b0d18f995..c5b0d18f995 100644
--- a/lldb/test/lang/c/inlines/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/Makefile
diff --git a/lldb/test/lang/c/inlines/inlines.c b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/inlines.c
index 1e920f1ef2f..1e920f1ef2f 100644
--- a/lldb/test/lang/c/inlines/inlines.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/inlines.c
diff --git a/lldb/test/lang/c/inlines/inlines.h b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/inlines.h
index 265d7b4966e..265d7b4966e 100644
--- a/lldb/test/lang/c/inlines/inlines.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/inlines/inlines.h
diff --git a/lldb/test/lang/c/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/modules/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/Makefile
diff --git a/lldb/test/lang/c/modules/TestCModules.py b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
index 0453aa837b6..0453aa837b6 100644
--- a/lldb/test/lang/c/modules/TestCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/TestCModules.py
diff --git a/lldb/test/lang/c/modules/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/modules/main.c
index 2b244bc38d0..2b244bc38d0 100644
--- a/lldb/test/lang/c/modules/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/modules/main.c
diff --git a/lldb/test/lang/c/recurse/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/recurse/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/Makefile
diff --git a/lldb/test/lang/c/recurse/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/main.c
index 1159669ebf1..1159669ebf1 100644
--- a/lldb/test/lang/c/recurse/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/recurse/main.c
diff --git a/lldb/test/lang/c/register_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
index 12e55616b54..12e55616b54 100644
--- a/lldb/test/lang/c/register_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
diff --git a/lldb/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
index b20309395a9..b20309395a9 100644
--- a/lldb/test/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
diff --git a/lldb/test/lang/c/register_variables/test.c b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c
index e467ac48f74..e467ac48f74 100644
--- a/lldb/test/lang/c/register_variables/test.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/test.c
diff --git a/lldb/test/lang/c/set_values/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/set_values/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/Makefile
diff --git a/lldb/test/lang/c/set_values/TestSetValues.py b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
index 276d9ef05ea..276d9ef05ea 100644
--- a/lldb/test/lang/c/set_values/TestSetValues.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/TestSetValues.py
diff --git a/lldb/test/lang/c/set_values/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c
index 64f01a97a28..64f01a97a28 100644
--- a/lldb/test/lang/c/set_values/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/set_values/main.c
diff --git a/lldb/test/lang/c/shared_lib/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile
index 854002e6470..854002e6470 100644
--- a/lldb/test/lang/c/shared_lib/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/Makefile
diff --git a/lldb/test/lang/c/shared_lib/TestSharedLib.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
index fedb1d62225..fedb1d62225 100644
--- a/lldb/test/lang/c/shared_lib/TestSharedLib.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/TestSharedLib.py
diff --git a/lldb/test/lang/c/shared_lib/foo.c b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.c
index 6431bc496c3..6431bc496c3 100644
--- a/lldb/test/lang/c/shared_lib/foo.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.c
diff --git a/lldb/test/lang/c/shared_lib/foo.h b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.h
index 78b9e3f9c0d..78b9e3f9c0d 100644
--- a/lldb/test/lang/c/shared_lib/foo.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/foo.h
diff --git a/lldb/test/lang/c/shared_lib/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/main.c
index b4377de18c1..b4377de18c1 100644
--- a/lldb/test/lang/c/shared_lib/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib/main.c
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile
index 51347d73f09..51347d73f09 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/Makefile
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
index 549db3a407f..549db3a407f 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/TestSharedLibStrippedSymbols.py
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/foo.c b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.c
index 6431bc496c3..6431bc496c3 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/foo.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.c
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/foo.h b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.h
index 78b3c124538..78b3c124538 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/foo.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/foo.h
diff --git a/lldb/test/lang/c/shared_lib_stripped_symbols/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/main.c
index b4377de18c1..b4377de18c1 100644
--- a/lldb/test/lang/c/shared_lib_stripped_symbols/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/shared_lib_stripped_symbols/main.c
diff --git a/lldb/test/lang/c/stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/Makefile
diff --git a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
index 5048d014f60..5048d014f60 100644
--- a/lldb/test/lang/c/stepping/TestStepAndBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestStepAndBreakpoints.py
diff --git a/lldb/test/lang/c/stepping/TestThreadStepping.py b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
index fcc8428d5d7..fcc8428d5d7 100644
--- a/lldb/test/lang/c/stepping/TestThreadStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/TestThreadStepping.py
diff --git a/lldb/test/lang/c/stepping/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c
index d8b4a2da761..d8b4a2da761 100644
--- a/lldb/test/lang/c/stepping/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/stepping/main.c
diff --git a/lldb/test/lang/c/strings/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/strings/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/Makefile
diff --git a/lldb/test/lang/c/strings/TestCStrings.py b/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
index f1d9be2149f..f1d9be2149f 100644
--- a/lldb/test/lang/c/strings/TestCStrings.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/TestCStrings.py
diff --git a/lldb/test/lang/c/strings/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c
index e02580b407f..e02580b407f 100644
--- a/lldb/test/lang/c/strings/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/strings/main.c
diff --git a/lldb/test/lang/c/struct_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile
index cd9ca5c86d8..cd9ca5c86d8 100644
--- a/lldb/test/lang/c/struct_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/Makefile
diff --git a/lldb/test/lang/c/struct_types/TestStructTypes.py b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
index 0e3ec28955d..0e3ec28955d 100644
--- a/lldb/test/lang/c/struct_types/TestStructTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/TestStructTypes.py
diff --git a/lldb/test/lang/c/struct_types/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c
index 29ac10cb94a..29ac10cb94a 100644
--- a/lldb/test/lang/c/struct_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/struct_types/main.c
diff --git a/lldb/test/lang/c/tls_globals/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile
index 90affed8e3a..90affed8e3a 100644
--- a/lldb/test/lang/c/tls_globals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/Makefile
diff --git a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
index 6236519a784..6236519a784 100644
--- a/lldb/test/lang/c/tls_globals/TestTlsGlobals.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py
diff --git a/lldb/test/lang/c/tls_globals/a.c b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c
index b9a85902d11..b9a85902d11 100644
--- a/lldb/test/lang/c/tls_globals/a.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/a.c
diff --git a/lldb/test/lang/c/tls_globals/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c
index cbe01b89b7e..cbe01b89b7e 100644
--- a/lldb/test/lang/c/tls_globals/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/main.c
diff --git a/lldb/test/lang/c/typedef/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/lang/c/typedef/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Makefile
diff --git a/lldb/test/lang/c/typedef/Testtypedef.py b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
index f8f3393307a..f8f3393307a 100644
--- a/lldb/test/lang/c/typedef/Testtypedef.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/Testtypedef.py
diff --git a/lldb/test/lang/c/typedef/main.c b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c
index 6c13affbbc1..6c13affbbc1 100644
--- a/lldb/test/lang/c/typedef/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/typedef/main.c
diff --git a/lldb/test/lang/cpp/bool/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/bool/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/Makefile
diff --git a/lldb/test/lang/cpp/bool/TestCPPBool.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
index 0724fc56251..0724fc56251 100644
--- a/lldb/test/lang/cpp/bool/TestCPPBool.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/TestCPPBool.py
diff --git a/lldb/test/lang/cpp/bool/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp
index 88d02d5b289..88d02d5b289 100644
--- a/lldb/test/lang/cpp/bool/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/bool/main.cpp
diff --git a/lldb/test/lang/cpp/breakpoint-commands/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile
index 1d1f38f7fd0..1d1f38f7fd0 100644
--- a/lldb/test/lang/cpp/breakpoint-commands/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/Makefile
diff --git a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
index 3f788b7fd6f..3f788b7fd6f 100644
--- a/lldb/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/TestCPPBreakpointCommands.py
diff --git a/lldb/test/lang/cpp/breakpoint-commands/nested.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/nested.cpp
index 29d4b4cb19e..29d4b4cb19e 100644
--- a/lldb/test/lang/cpp/breakpoint-commands/nested.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/breakpoint-commands/nested.cpp
diff --git a/lldb/test/lang/cpp/call-function/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/call-function/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/Makefile
diff --git a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
index bba23992c3c..bba23992c3c 100644
--- a/lldb/test/lang/cpp/call-function/TestCallCPPFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/TestCallCPPFunction.py
diff --git a/lldb/test/lang/cpp/call-function/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/main.cpp
index 61a5e9d21ab..61a5e9d21ab 100644
--- a/lldb/test/lang/cpp/call-function/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/call-function/main.cpp
diff --git a/lldb/test/lang/cpp/chained-calls/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/chained-calls/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/Makefile
diff --git a/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
index fa9338ab51b..fa9338ab51b 100644
--- a/lldb/test/lang/cpp/chained-calls/TestCppChainedCalls.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/TestCppChainedCalls.py
diff --git a/lldb/test/lang/cpp/chained-calls/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/main.cpp
index a888c3f6c55..a888c3f6c55 100644
--- a/lldb/test/lang/cpp/chained-calls/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/chained-calls/main.cpp
diff --git a/lldb/test/lang/cpp/char1632_t/.categories b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/.categories
index fe1da0247c6..fe1da0247c6 100644
--- a/lldb/test/lang/cpp/char1632_t/.categories
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/.categories
diff --git a/lldb/test/lang/cpp/char1632_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
index 932046f2696..932046f2696 100644
--- a/lldb/test/lang/cpp/char1632_t/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/Makefile
diff --git a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
index b37c1bbdb71..b37c1bbdb71 100644
--- a/lldb/test/lang/cpp/char1632_t/TestChar1632T.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/TestChar1632T.py
diff --git a/lldb/test/lang/cpp/char1632_t/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp
index b92c2d57292..b92c2d57292 100644
--- a/lldb/test/lang/cpp/char1632_t/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/char1632_t/main.cpp
diff --git a/lldb/test/lang/cpp/class_static/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/class_static/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/Makefile
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
index 6d88585e453..6d88585e453 100644
--- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/TestStaticVariables.py
diff --git a/lldb/test/lang/cpp/class_static/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp
index 2068eadcac5..2068eadcac5 100644
--- a/lldb/test/lang/cpp/class_static/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_static/main.cpp
diff --git a/lldb/test/lang/cpp/class_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/class_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/Makefile
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
index 822a257bce7..822a257bce7 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypes.py
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
index 5a56f9d0fd2..5a56f9d0fd2 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypesDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/TestClassTypesDisassembly.py
diff --git a/lldb/test/lang/cpp/class_types/cmds.txt b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/cmds.txt
index 1c7ef9f1c8a..1c7ef9f1c8a 100644
--- a/lldb/test/lang/cpp/class_types/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/cmds.txt
diff --git a/lldb/test/lang/cpp/class_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
index 251e66c3c9f..251e66c3c9f 100644
--- a/lldb/test/lang/cpp/class_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/class_types/main.cpp
diff --git a/lldb/test/lang/cpp/diamond/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/diamond/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/Makefile
diff --git a/lldb/test/lang/cpp/diamond/TestDiamond.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
index f4222ebedfe..f4222ebedfe 100644
--- a/lldb/test/lang/cpp/diamond/TestDiamond.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/TestDiamond.py
diff --git a/lldb/test/lang/cpp/diamond/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
index bfe098a089f..bfe098a089f 100644
--- a/lldb/test/lang/cpp/diamond/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/diamond/main.cpp
diff --git a/lldb/test/lang/cpp/dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile
index 8770b2343ef..8770b2343ef 100644
--- a/lldb/test/lang/cpp/dynamic-value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/Makefile
diff --git a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
index 5d5d471ccc7..5d5d471ccc7 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestCppValueCast.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestCppValueCast.py
diff --git a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
index ee40cb14173..ee40cb14173 100644
--- a/lldb/test/lang/cpp/dynamic-value/TestDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/TestDynamicValue.py
diff --git a/lldb/test/lang/cpp/dynamic-value/pass-to-base.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/pass-to-base.cpp
index 2bccf330382..2bccf330382 100644
--- a/lldb/test/lang/cpp/dynamic-value/pass-to-base.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/pass-to-base.cpp
diff --git a/lldb/test/lang/cpp/dynamic-value/sbvalue-cast.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
index 00fd7dad438..00fd7dad438 100644
--- a/lldb/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/dynamic-value/sbvalue-cast.cpp
diff --git a/lldb/test/lang/cpp/enum_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
index 0e0f5d1dad3..0e0f5d1dad3 100644
--- a/lldb/test/lang/cpp/enum_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/Makefile
diff --git a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
index ec19c1bf920..ec19c1bf920 100644
--- a/lldb/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/TestCPP11EnumTypes.py
diff --git a/lldb/test/lang/cpp/enum_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp
index 8595050afbb..8595050afbb 100644
--- a/lldb/test/lang/cpp/enum_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/enum_types/main.cpp
diff --git a/lldb/test/lang/cpp/exceptions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile
index a6bd8463ad5..a6bd8463ad5 100644
--- a/lldb/test/lang/cpp/exceptions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/Makefile
diff --git a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
index 452f98889c2..452f98889c2 100644
--- a/lldb/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/TestCPPExceptionBreakpoints.py
diff --git a/lldb/test/lang/cpp/exceptions/exceptions.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/exceptions.cpp
index 150d420b241..150d420b241 100644
--- a/lldb/test/lang/cpp/exceptions/exceptions.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/exceptions/exceptions.cpp
diff --git a/lldb/test/lang/cpp/global_operators/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/global_operators/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/Makefile
diff --git a/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
index 68ff52eb4d1..68ff52eb4d1 100644
--- a/lldb/test/lang/cpp/global_operators/TestCppGlobalOperators.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/TestCppGlobalOperators.py
diff --git a/lldb/test/lang/cpp/global_operators/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/main.cpp
index a0dd0787fa3..a0dd0787fa3 100644
--- a/lldb/test/lang/cpp/global_operators/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/global_operators/main.cpp
diff --git a/lldb/test/lang/cpp/incomplete-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile
index 6595e33b726..6595e33b726 100644
--- a/lldb/test/lang/cpp/incomplete-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/Makefile
diff --git a/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
index 2764f311667..2764f311667 100644
--- a/lldb/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/TestCppIncompleteTypes.py
diff --git a/lldb/test/lang/cpp/incomplete-types/a.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.cpp
index 36b374be6f3..36b374be6f3 100644
--- a/lldb/test/lang/cpp/incomplete-types/a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.cpp
diff --git a/lldb/test/lang/cpp/incomplete-types/a.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.h
index 13e9496e3fd..13e9496e3fd 100644
--- a/lldb/test/lang/cpp/incomplete-types/a.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/a.h
diff --git a/lldb/test/lang/cpp/incomplete-types/length.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.cpp
index 90a3b640f73..90a3b640f73 100644
--- a/lldb/test/lang/cpp/incomplete-types/length.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.cpp
diff --git a/lldb/test/lang/cpp/incomplete-types/length.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.h
index 96df4f02180..96df4f02180 100644
--- a/lldb/test/lang/cpp/incomplete-types/length.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/length.h
diff --git a/lldb/test/lang/cpp/incomplete-types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/main.cpp
index ad324c90581..ad324c90581 100644
--- a/lldb/test/lang/cpp/incomplete-types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/incomplete-types/main.cpp
diff --git a/lldb/test/lang/cpp/limit-debug-info/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile
index b9a3d3fe1c8..b9a3d3fe1c8 100644
--- a/lldb/test/lang/cpp/limit-debug-info/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/Makefile
diff --git a/lldb/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
index dec31f78bbc..dec31f78bbc 100644
--- a/lldb/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/TestWithLimitDebugInfo.py
diff --git a/lldb/test/lang/cpp/limit-debug-info/base.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.cpp
index 4023bdbc64a..4023bdbc64a 100644
--- a/lldb/test/lang/cpp/limit-debug-info/base.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.cpp
diff --git a/lldb/test/lang/cpp/limit-debug-info/base.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.h
index d3a09572bd2..d3a09572bd2 100644
--- a/lldb/test/lang/cpp/limit-debug-info/base.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/base.h
diff --git a/lldb/test/lang/cpp/limit-debug-info/derived.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.cpp
index 9d773593eb5..9d773593eb5 100644
--- a/lldb/test/lang/cpp/limit-debug-info/derived.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.cpp
diff --git a/lldb/test/lang/cpp/limit-debug-info/derived.h b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.h
index 46b3f83b9f7..46b3f83b9f7 100644
--- a/lldb/test/lang/cpp/limit-debug-info/derived.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/derived.h
diff --git a/lldb/test/lang/cpp/limit-debug-info/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/main.cpp
index 64e0349b582..64e0349b582 100644
--- a/lldb/test/lang/cpp/limit-debug-info/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/limit-debug-info/main.cpp
diff --git a/lldb/test/lang/cpp/namespace/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/namespace/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/Makefile
diff --git a/lldb/test/lang/cpp/namespace/TestNamespace.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
index 80a710b25d7..80a710b25d7 100644
--- a/lldb/test/lang/cpp/namespace/TestNamespace.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespace.py
diff --git a/lldb/test/lang/cpp/namespace/cmds.txt b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/cmds.txt
index 76bb1bcba75..76bb1bcba75 100644
--- a/lldb/test/lang/cpp/namespace/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/cmds.txt
diff --git a/lldb/test/lang/cpp/namespace/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
index 4dec275c2c5..4dec275c2c5 100644
--- a/lldb/test/lang/cpp/namespace/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/main.cpp
diff --git a/lldb/test/lang/cpp/nsimport/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/nsimport/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/Makefile
diff --git a/lldb/test/lang/cpp/nsimport/TestCppNsImport.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
index 3411959aaa1..3411959aaa1 100644
--- a/lldb/test/lang/cpp/nsimport/TestCppNsImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/TestCppNsImport.py
diff --git a/lldb/test/lang/cpp/nsimport/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/main.cpp
index e125ebaa243..e125ebaa243 100644
--- a/lldb/test/lang/cpp/nsimport/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/nsimport/main.cpp
diff --git a/lldb/test/lang/cpp/overloaded-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile
index a8d5c4eb026..a8d5c4eb026 100644
--- a/lldb/test/lang/cpp/overloaded-functions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/Makefile
diff --git a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
index 7eff685abca..7eff685abca 100644
--- a/lldb/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/TestOverloadedFunctions.py
diff --git a/lldb/test/lang/cpp/overloaded-functions/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/main.cpp
index 250e2cd1d96..250e2cd1d96 100644
--- a/lldb/test/lang/cpp/overloaded-functions/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/main.cpp
diff --git a/lldb/test/lang/cpp/overloaded-functions/static-a.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-a.cpp
index 7250fa4bed5..7250fa4bed5 100644
--- a/lldb/test/lang/cpp/overloaded-functions/static-a.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-a.cpp
diff --git a/lldb/test/lang/cpp/overloaded-functions/static-b.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-b.cpp
index 90a20f69e6d..90a20f69e6d 100644
--- a/lldb/test/lang/cpp/overloaded-functions/static-b.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/overloaded-functions/static-b.cpp
diff --git a/lldb/test/lang/cpp/rdar12991846/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/Makefile
index 1476447db35..1476447db35 100644
--- a/lldb/test/lang/cpp/rdar12991846/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/Makefile
diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
index 48d633ec398..48d633ec398 100644
--- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/TestRdar12991846.py
diff --git a/lldb/test/lang/cpp/rdar12991846/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/main.cpp
index fda951a7899..fda951a7899 100644
--- a/lldb/test/lang/cpp/rdar12991846/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rdar12991846/main.cpp
diff --git a/lldb/test/lang/cpp/rvalue-references/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile
index 3a1d8a57935..3a1d8a57935 100644
--- a/lldb/test/lang/cpp/rvalue-references/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/Makefile
diff --git a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
index 2f62be57910..2f62be57910 100644
--- a/lldb/test/lang/cpp/rvalue-references/TestRvalueReferences.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/TestRvalueReferences.py
diff --git a/lldb/test/lang/cpp/rvalue-references/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/main.cpp
index 6da34c73f10..6da34c73f10 100644
--- a/lldb/test/lang/cpp/rvalue-references/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/rvalue-references/main.cpp
diff --git a/lldb/test/lang/cpp/scope/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/scope/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/Makefile
diff --git a/lldb/test/lang/cpp/scope/TestCppScope.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
index f984eed86e4..f984eed86e4 100644
--- a/lldb/test/lang/cpp/scope/TestCppScope.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/TestCppScope.py
diff --git a/lldb/test/lang/cpp/scope/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/main.cpp
index da5d7ed529d..da5d7ed529d 100644
--- a/lldb/test/lang/cpp/scope/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/scope/main.cpp
diff --git a/lldb/test/lang/cpp/signed_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/signed_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/Makefile
diff --git a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
index e677a24b54f..e677a24b54f 100644
--- a/lldb/test/lang/cpp/signed_types/TestSignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/TestSignedTypes.py
diff --git a/lldb/test/lang/cpp/signed_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp
index dbf3606aeba..dbf3606aeba 100644
--- a/lldb/test/lang/cpp/signed_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/signed_types/main.cpp
diff --git a/lldb/test/lang/cpp/static_members/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/static_members/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/Makefile
diff --git a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
index 004ec286156..004ec286156 100644
--- a/lldb/test/lang/cpp/static_members/TestCPPStaticMembers.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/TestCPPStaticMembers.py
diff --git a/lldb/test/lang/cpp/static_members/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp
index 7ccc2f9a328..7ccc2f9a328 100644
--- a/lldb/test/lang/cpp/static_members/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_members/main.cpp
diff --git a/lldb/test/lang/cpp/static_methods/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/static_methods/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/Makefile
diff --git a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
index 4887a69788d..4887a69788d 100644
--- a/lldb/test/lang/cpp/static_methods/TestCPPStaticMethods.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/TestCPPStaticMethods.py
diff --git a/lldb/test/lang/cpp/static_methods/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp
index 5141a407d11..5141a407d11 100644
--- a/lldb/test/lang/cpp/static_methods/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/static_methods/main.cpp
diff --git a/lldb/test/lang/cpp/stl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
index f61a6300a99..f61a6300a99 100644
--- a/lldb/test/lang/cpp/stl/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/Makefile
diff --git a/lldb/test/lang/cpp/stl/TestSTL.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
index 83cfd3edcee..83cfd3edcee 100644
--- a/lldb/test/lang/cpp/stl/TestSTL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestSTL.py
diff --git a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
index 48cd0ae763d..48cd0ae763d 100644
--- a/lldb/test/lang/cpp/stl/TestStdCXXDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/TestStdCXXDisassembly.py
diff --git a/lldb/test/lang/cpp/stl/cmds.txt b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/cmds.txt
index 9c9c2e3db57..9c9c2e3db57 100644
--- a/lldb/test/lang/cpp/stl/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/cmds.txt
diff --git a/lldb/test/lang/cpp/stl/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp
index cfdb7b2d3db..cfdb7b2d3db 100644
--- a/lldb/test/lang/cpp/stl/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/stl/main.cpp
diff --git a/lldb/test/lang/cpp/this/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/this/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/Makefile
diff --git a/lldb/test/lang/cpp/this/TestCPPThis.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
index 4c99845b31a..4c99845b31a 100644
--- a/lldb/test/lang/cpp/this/TestCPPThis.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/TestCPPThis.py
diff --git a/lldb/test/lang/cpp/this/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp
index 4448a5cadf5..4448a5cadf5 100644
--- a/lldb/test/lang/cpp/this/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/this/main.cpp
diff --git a/lldb/test/lang/cpp/unique-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/unique-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/Makefile
diff --git a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
index 577b038eb58..577b038eb58 100644
--- a/lldb/test/lang/cpp/unique-types/TestUniqueTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/TestUniqueTypes.py
diff --git a/lldb/test/lang/cpp/unique-types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp
index c551c0e2c0d..c551c0e2c0d 100644
--- a/lldb/test/lang/cpp/unique-types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unique-types/main.cpp
diff --git a/lldb/test/lang/cpp/unsigned_types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/unsigned_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/Makefile
diff --git a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
index a463bf5f324..a463bf5f324 100644
--- a/lldb/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/TestUnsignedTypes.py
diff --git a/lldb/test/lang/cpp/unsigned_types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp
index b0d68377e98..b0d68377e98 100644
--- a/lldb/test/lang/cpp/unsigned_types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/unsigned_types/main.cpp
diff --git a/lldb/test/lang/cpp/virtual/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/cpp/virtual/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/Makefile
diff --git a/lldb/test/lang/cpp/virtual/TestVirtual.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
index 6863c071056..6863c071056 100644
--- a/lldb/test/lang/cpp/virtual/TestVirtual.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/TestVirtual.py
diff --git a/lldb/test/lang/cpp/virtual/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
index bed1422dcbd..bed1422dcbd 100644
--- a/lldb/test/lang/cpp/virtual/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/virtual/main.cpp
diff --git a/lldb/test/lang/cpp/wchar_t/.categories b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/.categories
index fe1da0247c6..fe1da0247c6 100644
--- a/lldb/test/lang/cpp/wchar_t/.categories
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/.categories
diff --git a/lldb/test/lang/cpp/wchar_t/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
index fe27980afe9..fe27980afe9 100644
--- a/lldb/test/lang/cpp/wchar_t/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/Makefile
diff --git a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
index d70874726e6..d70874726e6 100644
--- a/lldb/test/lang/cpp/wchar_t/TestCxxWCharT.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/TestCxxWCharT.py
diff --git a/lldb/test/lang/cpp/wchar_t/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp
index e249c37b678..e249c37b678 100644
--- a/lldb/test/lang/cpp/wchar_t/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/wchar_t/main.cpp
diff --git a/lldb/test/lang/go/goroutines/TestGoroutines.py b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
index 46d2e61ea88..46d2e61ea88 100644
--- a/lldb/test/lang/go/goroutines/TestGoroutines.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/TestGoroutines.py
diff --git a/lldb/test/lang/go/goroutines/main.go b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/main.go
index bb44f7b8b71..bb44f7b8b71 100644
--- a/lldb/test/lang/go/goroutines/main.go
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/goroutines/main.go
diff --git a/lldb/test/lang/go/runtime/TestGoLanguageRuntime b/lldb/packages/Python/lldbsuite/test/lang/go/runtime/TestGoLanguageRuntime
index 44797077a64..44797077a64 100644
--- a/lldb/test/lang/go/runtime/TestGoLanguageRuntime
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/runtime/TestGoLanguageRuntime
diff --git a/lldb/test/lang/go/runtime/main.go b/lldb/packages/Python/lldbsuite/test/lang/go/runtime/main.go
index 227c8c377ed..227c8c377ed 100644
--- a/lldb/test/lang/go/runtime/main.go
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/runtime/main.go
diff --git a/lldb/test/lang/go/types/TestGoASTContext.py b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
index a9d9745b0d0..a9d9745b0d0 100644
--- a/lldb/test/lang/go/types/TestGoASTContext.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/types/TestGoASTContext.py
diff --git a/lldb/test/lang/go/types/main.go b/lldb/packages/Python/lldbsuite/test/lang/go/types/main.go
index c74650721d7..c74650721d7 100644
--- a/lldb/test/lang/go/types/main.go
+++ b/lldb/packages/Python/lldbsuite/test/lang/go/types/main.go
diff --git a/lldb/test/lang/mixed/Makefile b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile
index 860343ee907..860343ee907 100644
--- a/lldb/test/lang/mixed/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/Makefile
diff --git a/lldb/test/lang/mixed/TestMixedLanguages.py b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
index 7aedc1d1843..7aedc1d1843 100644
--- a/lldb/test/lang/mixed/TestMixedLanguages.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/TestMixedLanguages.py
diff --git a/lldb/test/lang/mixed/foo.cpp b/lldb/packages/Python/lldbsuite/test/lang/mixed/foo.cpp
index 8a5a6a2b541..8a5a6a2b541 100644
--- a/lldb/test/lang/mixed/foo.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/foo.cpp
diff --git a/lldb/test/lang/mixed/main.c b/lldb/packages/Python/lldbsuite/test/lang/mixed/main.c
index f5c5d19f2c8..f5c5d19f2c8 100644
--- a/lldb/test/lang/mixed/main.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/mixed/main.c
diff --git a/lldb/test/lang/objc/.categories b/lldb/packages/Python/lldbsuite/test/lang/objc/.categories
index 72cf07c1efe..72cf07c1efe 100644
--- a/lldb/test/lang/objc/.categories
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/.categories
diff --git a/lldb/test/lang/objc/blocks/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile
index 0af83591826..0af83591826 100644
--- a/lldb/test/lang/objc/blocks/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/Makefile
diff --git a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
index 291f7eccc6d..291f7eccc6d 100644
--- a/lldb/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/TestObjCIvarsInBlocks.py
diff --git a/lldb/test/lang/objc/blocks/ivars-in-blocks.h b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.h
index 1ceac3361ac..1ceac3361ac 100644
--- a/lldb/test/lang/objc/blocks/ivars-in-blocks.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.h
diff --git a/lldb/test/lang/objc/blocks/ivars-in-blocks.m b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.m
index 1098a9136ae..1098a9136ae 100644
--- a/lldb/test/lang/objc/blocks/ivars-in-blocks.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/ivars-in-blocks.m
diff --git a/lldb/test/lang/objc/blocks/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/main.m
index 0c56f45da46..0c56f45da46 100644
--- a/lldb/test/lang/objc/blocks/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/blocks/main.m
diff --git a/lldb/test/lang/objc/forward-decl/Container.h b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.h
index 85bbd06b161..85bbd06b161 100644
--- a/lldb/test/lang/objc/forward-decl/Container.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.h
diff --git a/lldb/test/lang/objc/forward-decl/Container.m b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.m
index 4d2139ff5fc..4d2139ff5fc 100644
--- a/lldb/test/lang/objc/forward-decl/Container.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Container.m
diff --git a/lldb/test/lang/objc/forward-decl/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile
index b99925b50b3..b99925b50b3 100644
--- a/lldb/test/lang/objc/forward-decl/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/Makefile
diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
index 38736e70c95..38736e70c95 100644
--- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/TestForwardDecl.py
diff --git a/lldb/test/lang/objc/forward-decl/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/main.m
index 8e5256e9523..8e5256e9523 100644
--- a/lldb/test/lang/objc/forward-decl/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/forward-decl/main.m
diff --git a/lldb/test/lang/objc/foundation/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile
index ce2ccd28321..ce2ccd28321 100644
--- a/lldb/test/lang/objc/foundation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/Makefile
diff --git a/lldb/test/lang/objc/foundation/TestConstStrings.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
index 67c643a50e7..67c643a50e7 100644
--- a/lldb/test/lang/objc/foundation/TestConstStrings.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestConstStrings.py
diff --git a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
index 4ad2698cc38..4ad2698cc38 100644
--- a/lldb/test/lang/objc/foundation/TestFoundationDisassembly.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestFoundationDisassembly.py
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
index 2bf5b7f772b..2bf5b7f772b 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods.py
diff --git a/lldb/test/lang/objc/foundation/TestObjCMethods2.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
index ffa0d673afc..ffa0d673afc 100644
--- a/lldb/test/lang/objc/foundation/TestObjCMethods2.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjCMethods2.py
diff --git a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
index 85b08592ed7..85b08592ed7 100644
--- a/lldb/test/lang/objc/foundation/TestObjectDescriptionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestObjectDescriptionAPI.py
diff --git a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
index d04660d4360..d04660d4360 100644
--- a/lldb/test/lang/objc/foundation/TestRuntimeTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestRuntimeTypes.py
diff --git a/lldb/test/lang/objc/foundation/TestSymbolTable.py b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
index 0e2c5ed21b0..0e2c5ed21b0 100644
--- a/lldb/test/lang/objc/foundation/TestSymbolTable.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/TestSymbolTable.py
diff --git a/lldb/test/lang/objc/foundation/const-strings.m b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/const-strings.m
index 8a43abee7b8..8a43abee7b8 100644
--- a/lldb/test/lang/objc/foundation/const-strings.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/const-strings.m
diff --git a/lldb/test/lang/objc/foundation/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/main.m
index 519bec5a3e6..519bec5a3e6 100644
--- a/lldb/test/lang/objc/foundation/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/main.m
diff --git a/lldb/test/lang/objc/foundation/my-base.h b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.h
index 53202aa0de3..53202aa0de3 100644
--- a/lldb/test/lang/objc/foundation/my-base.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.h
diff --git a/lldb/test/lang/objc/foundation/my-base.m b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.m
index 0c316b244f2..0c316b244f2 100644
--- a/lldb/test/lang/objc/foundation/my-base.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/foundation/my-base.m
diff --git a/lldb/test/lang/objc/hidden-ivars/InternalDefiner.h b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.h
index 59652d4b09c..59652d4b09c 100644
--- a/lldb/test/lang/objc/hidden-ivars/InternalDefiner.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.h
diff --git a/lldb/test/lang/objc/hidden-ivars/InternalDefiner.m b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.m
index 1a10ce021ce..1a10ce021ce 100644
--- a/lldb/test/lang/objc/hidden-ivars/InternalDefiner.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/InternalDefiner.m
diff --git a/lldb/test/lang/objc/hidden-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile
index 1768d11ca27..1768d11ca27 100644
--- a/lldb/test/lang/objc/hidden-ivars/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/Makefile
diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index 9a16fd1284c..9a16fd1284c 100644
--- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/TestHiddenIvars.py
diff --git a/lldb/test/lang/objc/hidden-ivars/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/main.m
index 1795d56e7d8..1795d56e7d8 100644
--- a/lldb/test/lang/objc/hidden-ivars/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/hidden-ivars/main.m
diff --git a/lldb/test/lang/objc/ivar-IMP/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
index 329ceabeea9..329ceabeea9 100644
--- a/lldb/test/lang/objc/ivar-IMP/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/Makefile
diff --git a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
index 30126ebdb60..30126ebdb60 100644
--- a/lldb/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/TestObjCiVarIMP.py
diff --git a/lldb/test/lang/objc/ivar-IMP/myclass.h b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.h
index da28d1e0518..da28d1e0518 100644
--- a/lldb/test/lang/objc/ivar-IMP/myclass.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.h
diff --git a/lldb/test/lang/objc/ivar-IMP/myclass.m b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.m
index 3ff2ac7fe78..3ff2ac7fe78 100644
--- a/lldb/test/lang/objc/ivar-IMP/myclass.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/myclass.m
diff --git a/lldb/test/lang/objc/ivar-IMP/repro.m b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/repro.m
index dc522b224a1..dc522b224a1 100644
--- a/lldb/test/lang/objc/ivar-IMP/repro.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/ivar-IMP/repro.m
diff --git a/lldb/test/lang/objc/modules-auto-import/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile
index e42b59f9518..e42b59f9518 100644
--- a/lldb/test/lang/objc/modules-auto-import/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/Makefile
diff --git a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
index 6538f3f868a..6538f3f868a 100644
--- a/lldb/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/TestModulesAutoImport.py
diff --git a/lldb/test/lang/objc/modules-auto-import/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/main.m
index 5452ffd9bd1..5452ffd9bd1 100644
--- a/lldb/test/lang/objc/modules-auto-import/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-auto-import/main.m
diff --git a/lldb/test/lang/objc/modules-incomplete/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile
index cbd95de007d..cbd95de007d 100644
--- a/lldb/test/lang/objc/modules-incomplete/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/Makefile
diff --git a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
index f3d36332923..f3d36332923 100644
--- a/lldb/test/lang/objc/modules-incomplete/TestIncompleteModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/TestIncompleteModules.py
diff --git a/lldb/test/lang/objc/modules-incomplete/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/main.m
index 8ebfb0c1f11..8ebfb0c1f11 100644
--- a/lldb/test/lang/objc/modules-incomplete/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/main.m
diff --git a/lldb/test/lang/objc/modules-incomplete/module.map b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/module.map
index 2ef8064d15b..2ef8064d15b 100644
--- a/lldb/test/lang/objc/modules-incomplete/module.map
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/module.map
diff --git a/lldb/test/lang/objc/modules-incomplete/myModule.h b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.h
index d03dde0d07a..d03dde0d07a 100644
--- a/lldb/test/lang/objc/modules-incomplete/myModule.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.h
diff --git a/lldb/test/lang/objc/modules-incomplete/myModule.m b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.m
index d6a2619d801..d6a2619d801 100644
--- a/lldb/test/lang/objc/modules-incomplete/myModule.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-incomplete/myModule.m
diff --git a/lldb/test/lang/objc/modules-inline-functions/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile
index 6ad9e0010bb..6ad9e0010bb 100644
--- a/lldb/test/lang/objc/modules-inline-functions/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/Makefile
diff --git a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
index 007de7e100d..007de7e100d 100644
--- a/lldb/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/TestModulesInlineFunctions.py
diff --git a/lldb/test/lang/objc/modules-inline-functions/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/main.m
index 13a5bf316ee..13a5bf316ee 100644
--- a/lldb/test/lang/objc/modules-inline-functions/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/main.m
diff --git a/lldb/test/lang/objc/modules-inline-functions/module.map b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/module.map
index 2ef8064d15b..2ef8064d15b 100644
--- a/lldb/test/lang/objc/modules-inline-functions/module.map
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/module.map
diff --git a/lldb/test/lang/objc/modules-inline-functions/myModule.c b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.c
index ad3c85d155e..ad3c85d155e 100644
--- a/lldb/test/lang/objc/modules-inline-functions/myModule.c
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.c
diff --git a/lldb/test/lang/objc/modules-inline-functions/myModule.h b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.h
index d50d0101f64..d50d0101f64 100644
--- a/lldb/test/lang/objc/modules-inline-functions/myModule.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules-inline-functions/myModule.h
diff --git a/lldb/test/lang/objc/modules/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/lang/objc/modules/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/Makefile
diff --git a/lldb/test/lang/objc/modules/TestObjCModules.py b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
index ed925c57edc..ed925c57edc 100644
--- a/lldb/test/lang/objc/modules/TestObjCModules.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/TestObjCModules.py
diff --git a/lldb/test/lang/objc/modules/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/main.m
index 99b50f9620d..99b50f9620d 100644
--- a/lldb/test/lang/objc/modules/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/modules/main.m
diff --git a/lldb/test/lang/objc/objc++/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile
index 910d4943ef0..910d4943ef0 100644
--- a/lldb/test/lang/objc/objc++/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/Makefile
diff --git a/lldb/test/lang/objc/objc++/TestObjCXX.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
index 29f52d242b0..29f52d242b0 100644
--- a/lldb/test/lang/objc/objc++/TestObjCXX.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/TestObjCXX.py
diff --git a/lldb/test/lang/objc/objc++/main.mm b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/main.mm
index 50d2f0a8df3..50d2f0a8df3 100644
--- a/lldb/test/lang/objc/objc++/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc++/main.mm
diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile
index 7f7baeb3cf1..7f7baeb3cf1 100644
--- a/lldb/test/lang/objc/objc-baseclass-sbtype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/Makefile
diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
index c6dd996b0a4..c6dd996b0a4 100644
--- a/lldb/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/TestObjCBaseClassSBType.py
diff --git a/lldb/test/lang/objc/objc-baseclass-sbtype/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/main.m
index 3ec78fd0bd6..3ec78fd0bd6 100644
--- a/lldb/test/lang/objc/objc-baseclass-sbtype/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-baseclass-sbtype/main.m
diff --git a/lldb/test/lang/objc/objc-builtin-types/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/lang/objc/objc-builtin-types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/Makefile
diff --git a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
index cf09d8686c6..cf09d8686c6 100644
--- a/lldb/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/TestObjCBuiltinTypes.py
diff --git a/lldb/test/lang/objc/objc-builtin-types/main.cpp b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/main.cpp
index 6dd8cbc6e9f..6dd8cbc6e9f 100644
--- a/lldb/test/lang/objc/objc-builtin-types/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-builtin-types/main.cpp
diff --git a/lldb/test/lang/objc/objc-checker/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile
index a1608fe5a66..a1608fe5a66 100644
--- a/lldb/test/lang/objc/objc-checker/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/Makefile
diff --git a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
index 39578d5c078..39578d5c078 100644
--- a/lldb/test/lang/objc/objc-checker/TestObjCCheckers.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/TestObjCCheckers.py
diff --git a/lldb/test/lang/objc/objc-checker/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/main.m
index 4a09a2826f7..4a09a2826f7 100644
--- a/lldb/test/lang/objc/objc-checker/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-checker/main.m
diff --git a/lldb/test/lang/objc/objc-class-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile
index c2d07910a6e..c2d07910a6e 100644
--- a/lldb/test/lang/objc/objc-class-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/Makefile
diff --git a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
index 6c3c1832753..6c3c1832753 100644
--- a/lldb/test/lang/objc/objc-class-method/TestObjCClassMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/TestObjCClassMethod.py
diff --git a/lldb/test/lang/objc/objc-class-method/class.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/class.m
index 18a2c2729be..18a2c2729be 100644
--- a/lldb/test/lang/objc/objc-class-method/class.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-class-method/class.m
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/.categories b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/.categories
index 9526bab96fb..9526bab96fb 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/.categories
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/.categories
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile
index dd909afba21..dd909afba21 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/Makefile
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
index 75cf3e17e00..75cf3e17e00 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/TestObjCDynamicSBType.py
diff --git a/lldb/test/lang/objc/objc-dyn-sbtype/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/main.m
index f3587b52cd5..f3587b52cd5 100644
--- a/lldb/test/lang/objc/objc-dyn-sbtype/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dyn-sbtype/main.m
diff --git a/lldb/test/lang/objc/objc-dynamic-value/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile
index a981f4b9035..a981f4b9035 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/Makefile
diff --git a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
index cc8573a45c5..cc8573a45c5 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/TestObjCDynamicValue.py
diff --git a/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/dynamic-value.m
index 2bcb76b1d9d..2bcb76b1d9d 100644
--- a/lldb/test/lang/objc/objc-dynamic-value/dynamic-value.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-dynamic-value/dynamic-value.m
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile
index fdd3b5ebfa9..fdd3b5ebfa9 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/Makefile
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
index edbce826886..edbce826886 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/TestObjCIvarOffsets.py
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/main.m
index 41943f48aef..41943f48aef 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/main.m
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
index 99bbd427b06..99bbd427b06 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.h
diff --git a/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m
index db87adea3d1..db87adea3d1 100644
--- a/lldb/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-offsets/objc-ivar-offsets.m
diff --git a/lldb/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/TestIvarProtocols.py
diff --git a/lldb/test/lang/objc/objc-ivar-protocols/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/main.m
index aa6c4715c33..aa6c4715c33 100644
--- a/lldb/test/lang/objc/objc-ivar-protocols/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-protocols/main.m
diff --git a/lldb/test/lang/objc/objc-ivar-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
index 4365ed9ae93..4365ed9ae93 100644
--- a/lldb/test/lang/objc/objc-ivar-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/Makefile
diff --git a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
index 28b0fd7f201..28b0fd7f201 100644
--- a/lldb/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/TestObjCIvarStripped.py
diff --git a/lldb/test/lang/objc/objc-ivar-stripped/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/main.m
index ed9c1d9ec42..ed9c1d9ec42 100644
--- a/lldb/test/lang/objc/objc-ivar-stripped/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-ivar-stripped/main.m
diff --git a/lldb/test/lang/objc/objc-new-syntax/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/lang/objc/objc-new-syntax/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/Makefile
diff --git a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
index 78f5e5e8823..78f5e5e8823 100644
--- a/lldb/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/TestObjCNewSyntax.py
diff --git a/lldb/test/lang/objc/objc-new-syntax/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/main.m
index d77ba5b10de..d77ba5b10de 100644
--- a/lldb/test/lang/objc/objc-new-syntax/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-new-syntax/main.m
diff --git a/lldb/test/lang/objc/objc-optimized/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile
index aa6a7520525..aa6a7520525 100644
--- a/lldb/test/lang/objc/objc-optimized/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/Makefile
diff --git a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
index 5ac34ec2aa7..5ac34ec2aa7 100644
--- a/lldb/test/lang/objc/objc-optimized/TestObjcOptimized.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/TestObjcOptimized.py
diff --git a/lldb/test/lang/objc/objc-optimized/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/main.m
index df88eea0f86..df88eea0f86 100644
--- a/lldb/test/lang/objc/objc-optimized/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-optimized/main.m
diff --git a/lldb/test/lang/objc/objc-property/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile
index a1608fe5a66..a1608fe5a66 100644
--- a/lldb/test/lang/objc/objc-property/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/Makefile
diff --git a/lldb/test/lang/objc/objc-property/TestObjCProperty.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
index 963923f15e8..963923f15e8 100644
--- a/lldb/test/lang/objc/objc-property/TestObjCProperty.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/TestObjCProperty.py
diff --git a/lldb/test/lang/objc/objc-property/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/main.m
index 2ef142be9b0..2ef142be9b0 100644
--- a/lldb/test/lang/objc/objc-property/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-property/main.m
diff --git a/lldb/test/lang/objc/objc-runtime-ivars/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
index a1608fe5a66..a1608fe5a66 100644
--- a/lldb/test/lang/objc/objc-runtime-ivars/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/Makefile
diff --git a/lldb/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/TestRuntimeIvars.py
diff --git a/lldb/test/lang/objc/objc-runtime-ivars/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/main.m
index 1f5a9b077e2..1f5a9b077e2 100644
--- a/lldb/test/lang/objc/objc-runtime-ivars/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-runtime-ivars/main.m
diff --git a/lldb/test/lang/objc/objc-static-method-stripped/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
index 81e7f12dea2..81e7f12dea2 100644
--- a/lldb/test/lang/objc/objc-static-method-stripped/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/Makefile
diff --git a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
index cd9f239b946..cd9f239b946 100644
--- a/lldb/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/TestObjCStaticMethodStripped.py
diff --git a/lldb/test/lang/objc/objc-static-method-stripped/static.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/static.m
index ec7b2ef6719..ec7b2ef6719 100644
--- a/lldb/test/lang/objc/objc-static-method-stripped/static.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method-stripped/static.m
diff --git a/lldb/test/lang/objc/objc-static-method/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile
index a8e973f6d3b..a8e973f6d3b 100644
--- a/lldb/test/lang/objc/objc-static-method/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/Makefile
diff --git a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
index 4ce67749ae8..4ce67749ae8 100644
--- a/lldb/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/TestObjCStaticMethod.py
diff --git a/lldb/test/lang/objc/objc-static-method/static.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/static.m
index ec7b2ef6719..ec7b2ef6719 100644
--- a/lldb/test/lang/objc/objc-static-method/static.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-static-method/static.m
diff --git a/lldb/test/lang/objc/objc-stepping/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile
index b097fe65fce..b097fe65fce 100644
--- a/lldb/test/lang/objc/objc-stepping/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/Makefile
diff --git a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
index 3f72e7e4c4d..3f72e7e4c4d 100644
--- a/lldb/test/lang/objc/objc-stepping/TestObjCStepping.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/TestObjCStepping.py
diff --git a/lldb/test/lang/objc/objc-stepping/stepping-tests.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/stepping-tests.m
index 63db536dee4..63db536dee4 100644
--- a/lldb/test/lang/objc/objc-stepping/stepping-tests.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-stepping/stepping-tests.m
diff --git a/lldb/test/lang/objc/objc-struct-argument/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile
index c16802966cf..c16802966cf 100644
--- a/lldb/test/lang/objc/objc-struct-argument/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/Makefile
diff --git a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
index 388117a7cea..388117a7cea 100644
--- a/lldb/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/TestObjCStructArgument.py
diff --git a/lldb/test/lang/objc/objc-struct-argument/test.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m
index 8bf0ec07b71..8bf0ec07b71 100644
--- a/lldb/test/lang/objc/objc-struct-argument/test.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-argument/test.m
diff --git a/lldb/test/lang/objc/objc-struct-return/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile
index c16802966cf..c16802966cf 100644
--- a/lldb/test/lang/objc/objc-struct-return/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/Makefile
diff --git a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
index 08126e2f13a..08126e2f13a 100644
--- a/lldb/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/TestObjCStructReturn.py
diff --git a/lldb/test/lang/objc/objc-struct-return/test.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/test.m
index aafe231ea81..aafe231ea81 100644
--- a/lldb/test/lang/objc/objc-struct-return/test.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-struct-return/test.m
diff --git a/lldb/test/lang/objc/objc-super/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile
index c2d07910a6e..c2d07910a6e 100644
--- a/lldb/test/lang/objc/objc-super/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/Makefile
diff --git a/lldb/test/lang/objc/objc-super/TestObjCSuper.py b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
index ea9a2e5c7e5..ea9a2e5c7e5 100644
--- a/lldb/test/lang/objc/objc-super/TestObjCSuper.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/TestObjCSuper.py
diff --git a/lldb/test/lang/objc/objc-super/class.m b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/class.m
index b55b649aaae..b55b649aaae 100644
--- a/lldb/test/lang/objc/objc-super/class.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/objc-super/class.m
diff --git a/lldb/test/lang/objc/print-obj/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile
index dba1065cd71..dba1065cd71 100644
--- a/lldb/test/lang/objc/print-obj/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/Makefile
diff --git a/lldb/test/lang/objc/print-obj/TestPrintObj.py b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
index 4e6f92391ed..4e6f92391ed 100644
--- a/lldb/test/lang/objc/print-obj/TestPrintObj.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/TestPrintObj.py
diff --git a/lldb/test/lang/objc/print-obj/blocked.m b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m
index ba249755444..ba249755444 100644
--- a/lldb/test/lang/objc/print-obj/blocked.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/print-obj/blocked.m
diff --git a/lldb/test/lang/objc/radar-9691614/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/lang/objc/radar-9691614/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/Makefile
diff --git a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
index 8de6d2dc97a..8de6d2dc97a 100644
--- a/lldb/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/TestObjCMethodReturningBOOL.py
diff --git a/lldb/test/lang/objc/radar-9691614/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/main.m
index bb87d673452..bb87d673452 100644
--- a/lldb/test/lang/objc/radar-9691614/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/radar-9691614/main.m
diff --git a/lldb/test/lang/objc/rdar-10967107/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/lang/objc/rdar-10967107/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/Makefile
diff --git a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
index 631d5565f09..631d5565f09 100644
--- a/lldb/test/lang/objc/rdar-10967107/TestRdar10967107.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/TestRdar10967107.py
diff --git a/lldb/test/lang/objc/rdar-10967107/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/main.m
index 386a458950b..386a458950b 100644
--- a/lldb/test/lang/objc/rdar-10967107/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-10967107/main.m
diff --git a/lldb/test/lang/objc/rdar-11355592/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile
index ad3cb3fadcd..ad3cb3fadcd 100644
--- a/lldb/test/lang/objc/rdar-11355592/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/Makefile
diff --git a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
index 79b7c3e8802..79b7c3e8802 100644
--- a/lldb/test/lang/objc/rdar-11355592/TestRdar11355592.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/TestRdar11355592.py
diff --git a/lldb/test/lang/objc/rdar-11355592/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/main.m
index 09b3b18a787..09b3b18a787 100644
--- a/lldb/test/lang/objc/rdar-11355592/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-11355592/main.m
diff --git a/lldb/test/lang/objc/rdar-12408181/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile
index 385b557c9af..385b557c9af 100644
--- a/lldb/test/lang/objc/rdar-12408181/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/Makefile
diff --git a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
index 34054fffc38..34054fffc38 100644
--- a/lldb/test/lang/objc/rdar-12408181/TestRdar12408181.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/TestRdar12408181.py
diff --git a/lldb/test/lang/objc/rdar-12408181/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/main.m
index 858ba2a4a22..858ba2a4a22 100644
--- a/lldb/test/lang/objc/rdar-12408181/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/rdar-12408181/main.m
diff --git a/lldb/test/lang/objc/real-definition/Bar.h b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.h
index 20a81faa101..20a81faa101 100644
--- a/lldb/test/lang/objc/real-definition/Bar.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.h
diff --git a/lldb/test/lang/objc/real-definition/Bar.m b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.m
index 46d7e388875..46d7e388875 100644
--- a/lldb/test/lang/objc/real-definition/Bar.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Bar.m
diff --git a/lldb/test/lang/objc/real-definition/Foo.h b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.h
index 14ff9eed50f..14ff9eed50f 100644
--- a/lldb/test/lang/objc/real-definition/Foo.h
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.h
diff --git a/lldb/test/lang/objc/real-definition/Foo.m b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.m
index bcdeaeffc29..bcdeaeffc29 100644
--- a/lldb/test/lang/objc/real-definition/Foo.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Foo.m
diff --git a/lldb/test/lang/objc/real-definition/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile
index 61cc3b3b6db..61cc3b3b6db 100644
--- a/lldb/test/lang/objc/real-definition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/Makefile
diff --git a/lldb/test/lang/objc/real-definition/TestRealDefinition.py b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
index 3bf7bb7a9ff..3bf7bb7a9ff 100644
--- a/lldb/test/lang/objc/real-definition/TestRealDefinition.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/TestRealDefinition.py
diff --git a/lldb/test/lang/objc/real-definition/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/main.m
index 8c31dc9abb3..8c31dc9abb3 100644
--- a/lldb/test/lang/objc/real-definition/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/real-definition/main.m
diff --git a/lldb/test/lang/objc/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile
index a1608fe5a66..a1608fe5a66 100644
--- a/lldb/test/lang/objc/sample/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/Makefile
diff --git a/lldb/test/lang/objc/sample/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/main.m
index 9dffc71aaac..9dffc71aaac 100644
--- a/lldb/test/lang/objc/sample/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/sample/main.m
diff --git a/lldb/test/lang/objc/self/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile
index bdae30428be..bdae30428be 100644
--- a/lldb/test/lang/objc/self/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/Makefile
diff --git a/lldb/test/lang/objc/self/TestObjCSelf.py b/lldb/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
index 44736feaba3..44736feaba3 100644
--- a/lldb/test/lang/objc/self/TestObjCSelf.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/TestObjCSelf.py
diff --git a/lldb/test/lang/objc/self/main.m b/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m
index 928aaf2ff02..928aaf2ff02 100644
--- a/lldb/test/lang/objc/self/main.m
+++ b/lldb/packages/Python/lldbsuite/test/lang/objc/self/main.m
diff --git a/lldb/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py b/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/TestIvarVector.py
diff --git a/lldb/test/lang/objcxx/objcxx-ivar-vector/main.mm b/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/main.mm
index 36eda1da2ac..36eda1da2ac 100644
--- a/lldb/test/lang/objcxx/objcxx-ivar-vector/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/objcxx-ivar-vector/main.mm
diff --git a/lldb/test/lang/objcxx/sample/Makefile b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile
index edd3430de7c..edd3430de7c 100644
--- a/lldb/test/lang/objcxx/sample/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/Makefile
diff --git a/lldb/test/lang/objcxx/sample/main.mm b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/main.mm
index c9a2172c368..c9a2172c368 100644
--- a/lldb/test/lang/objcxx/sample/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/lang/objcxx/sample/main.mm
diff --git a/lldb/test/linux/builtin_trap/Makefile b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/linux/builtin_trap/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/Makefile
diff --git a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
index 3764f26d663..3764f26d663 100644
--- a/lldb/test/linux/builtin_trap/TestBuiltinTrap.py
+++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/TestBuiltinTrap.py
diff --git a/lldb/test/linux/builtin_trap/main.cpp b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/main.cpp
index 84156ef2ac4..84156ef2ac4 100644
--- a/lldb/test/linux/builtin_trap/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/linux/builtin_trap/main.cpp
diff --git a/lldb/test/linux/thread/create_during_instruction_step/Makefile b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile
index 67aa16625bf..67aa16625bf 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/Makefile
diff --git a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
index 130afa842f0..130afa842f0 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
+++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/TestCreateDuringInstructionStep.py
diff --git a/lldb/test/linux/thread/create_during_instruction_step/main.cpp b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/main.cpp
index 079e8b13798..079e8b13798 100644
--- a/lldb/test/linux/thread/create_during_instruction_step/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/linux/thread/create_during_instruction_step/main.cpp
diff --git a/lldb/test/lldb_pylint_helper.py b/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py
index e7674b2e8eb..e7674b2e8eb 100644
--- a/lldb/test/lldb_pylint_helper.py
+++ b/lldb/packages/Python/lldbsuite/test/lldb_pylint_helper.py
diff --git a/lldb/test/lldbbench.py b/lldb/packages/Python/lldbsuite/test/lldbbench.py
index a8cbffb8cd7..a8cbffb8cd7 100644
--- a/lldb/test/lldbbench.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbbench.py
diff --git a/lldb/test/lldbcurses.py b/lldb/packages/Python/lldbsuite/test/lldbcurses.py
index 3ad7ccc3740..3ad7ccc3740 100644
--- a/lldb/test/lldbcurses.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbcurses.py
diff --git a/lldb/test/lldbinline.py b/lldb/packages/Python/lldbsuite/test/lldbinline.py
index a03f3c800d5..a03f3c800d5 100644
--- a/lldb/test/lldbinline.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbinline.py
diff --git a/lldb/test/lldbpexpect.py b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
index 5fee6cff474..5fee6cff474 100644
--- a/lldb/test/lldbpexpect.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbpexpect.py
diff --git a/lldb/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
index e23a0ef0efc..e23a0ef0efc 100644
--- a/lldb/test/lldbplatformutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
diff --git a/lldb/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 8ab47fef772..8ab47fef772 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
diff --git a/lldb/test/lldbtest_config.py b/lldb/packages/Python/lldbsuite/test/lldbtest_config.py
index c2d4549437b..c2d4549437b 100644
--- a/lldb/test/lldbtest_config.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest_config.py
diff --git a/lldb/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py
index 0883c7d3853..0883c7d3853 100644
--- a/lldb/test/lldbutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py
diff --git a/lldb/test/lock.py b/lldb/packages/Python/lldbsuite/test/lock.py
index 89823b88abc..89823b88abc 100644
--- a/lldb/test/lock.py
+++ b/lldb/packages/Python/lldbsuite/test/lock.py
diff --git a/lldb/test/logging/Makefile b/lldb/packages/Python/lldbsuite/test/logging/Makefile
index d4bc9c68904..d4bc9c68904 100644
--- a/lldb/test/logging/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/logging/Makefile
diff --git a/lldb/test/logging/TestLogging.py b/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py
index a738ba8c5a7..a738ba8c5a7 100644
--- a/lldb/test/logging/TestLogging.py
+++ b/lldb/packages/Python/lldbsuite/test/logging/TestLogging.py
diff --git a/lldb/test/logging/main.cpp b/lldb/packages/Python/lldbsuite/test/logging/main.cpp
index 7af4e3de2d0..7af4e3de2d0 100644
--- a/lldb/test/logging/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/logging/main.cpp
diff --git a/lldb/test/macosx/add-dsym/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
index 4e4aa71de2a..4e4aa71de2a 100644
--- a/lldb/test/macosx/add-dsym/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/Makefile
diff --git a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
index 4324f0b560a..4324f0b560a 100644
--- a/lldb/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/TestAddDsymMidExecutionCommand.py
diff --git a/lldb/test/macosx/add-dsym/main.c b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/main.c
index da9e09f0738..da9e09f0738 100644
--- a/lldb/test/macosx/add-dsym/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/add-dsym/main.c
diff --git a/lldb/test/macosx/debug-info/apple_types/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/Makefile
index aa3a0fcdcea..aa3a0fcdcea 100644
--- a/lldb/test/macosx/debug-info/apple_types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/Makefile
diff --git a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
index 50f18b4bbbe..50f18b4bbbe 100644
--- a/lldb/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/TestAppleTypesIsProduced.py
diff --git a/lldb/test/macosx/debug-info/apple_types/main.c b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/main.c
index cb4bdb9c16b..cb4bdb9c16b 100644
--- a/lldb/test/macosx/debug-info/apple_types/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/debug-info/apple_types/main.c
diff --git a/lldb/test/macosx/indirect_symbol/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile
index 07aa39eac3b..07aa39eac3b 100644
--- a/lldb/test/macosx/indirect_symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile
diff --git a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
index 4ec5147e54e..4ec5147e54e 100644
--- a/lldb/test/macosx/indirect_symbol/TestIndirectSymbols.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py
diff --git a/lldb/test/macosx/indirect_symbol/alias.list b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/alias.list
index 3232c588837..3232c588837 100644
--- a/lldb/test/macosx/indirect_symbol/alias.list
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/alias.list
diff --git a/lldb/test/macosx/indirect_symbol/indirect.c b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/indirect.c
index 48e1459bb59..48e1459bb59 100644
--- a/lldb/test/macosx/indirect_symbol/indirect.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/indirect.c
diff --git a/lldb/test/macosx/indirect_symbol/main.c b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/main.c
index b5af058d00b..b5af058d00b 100644
--- a/lldb/test/macosx/indirect_symbol/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/main.c
diff --git a/lldb/test/macosx/indirect_symbol/reexport.c b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/reexport.c
index 096a463b3a4..096a463b3a4 100644
--- a/lldb/test/macosx/indirect_symbol/reexport.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/reexport.c
diff --git a/lldb/test/macosx/order/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
index 52fae2d2ca3..52fae2d2ca3 100644
--- a/lldb/test/macosx/order/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile
diff --git a/lldb/test/macosx/order/TestOrderFile.py b/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
index b768c3a7afc..b768c3a7afc 100644
--- a/lldb/test/macosx/order/TestOrderFile.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/TestOrderFile.py
diff --git a/lldb/test/macosx/order/cmds.txt b/lldb/packages/Python/lldbsuite/test/macosx/order/cmds.txt
index 8c51dd763bf..8c51dd763bf 100644
--- a/lldb/test/macosx/order/cmds.txt
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/cmds.txt
diff --git a/lldb/test/macosx/order/main.c b/lldb/packages/Python/lldbsuite/test/macosx/order/main.c
index cd1ea581876..cd1ea581876 100644
--- a/lldb/test/macosx/order/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/main.c
diff --git a/lldb/test/macosx/order/order-file b/lldb/packages/Python/lldbsuite/test/macosx/order/order-file
index 0cf8ecd2a63..0cf8ecd2a63 100644
--- a/lldb/test/macosx/order/order-file
+++ b/lldb/packages/Python/lldbsuite/test/macosx/order/order-file
diff --git a/lldb/test/macosx/queues/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile
index 93f2f7b2f34..93f2f7b2f34 100644
--- a/lldb/test/macosx/queues/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/Makefile
diff --git a/lldb/test/macosx/queues/TestQueues.py b/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
index 879f6c36a03..879f6c36a03 100644
--- a/lldb/test/macosx/queues/TestQueues.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/TestQueues.py
diff --git a/lldb/test/macosx/queues/main.c b/lldb/packages/Python/lldbsuite/test/macosx/queues/main.c
index fa6a3e570ae..fa6a3e570ae 100644
--- a/lldb/test/macosx/queues/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/queues/main.c
diff --git a/lldb/test/macosx/safe-to-func-call/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
index 93f2f7b2f34..93f2f7b2f34 100644
--- a/lldb/test/macosx/safe-to-func-call/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/Makefile
diff --git a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index cb9d7fb53b6..cb9d7fb53b6 100644
--- a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
diff --git a/lldb/test/macosx/safe-to-func-call/main.c b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c
index 613384ff73b..613384ff73b 100644
--- a/lldb/test/macosx/safe-to-func-call/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/safe-to-func-call/main.c
diff --git a/lldb/test/macosx/universal/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
index 854c78ed8c2..854c78ed8c2 100644
--- a/lldb/test/macosx/universal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/Makefile
diff --git a/lldb/test/macosx/universal/TestUniversal.py b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
index 12e0939224d..12e0939224d 100644
--- a/lldb/test/macosx/universal/TestUniversal.py
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/TestUniversal.py
diff --git a/lldb/test/macosx/universal/main.c b/lldb/packages/Python/lldbsuite/test/macosx/universal/main.c
index 9351c77f714..9351c77f714 100644
--- a/lldb/test/macosx/universal/main.c
+++ b/lldb/packages/Python/lldbsuite/test/macosx/universal/main.c
diff --git a/lldb/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index e72b2d0931e..e72b2d0931e 100644
--- a/lldb/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
diff --git a/lldb/test/make/test_common.h b/lldb/packages/Python/lldbsuite/test/make/test_common.h
index 6f819706366..6f819706366 100644
--- a/lldb/test/make/test_common.h
+++ b/lldb/packages/Python/lldbsuite/test/make/test_common.h
diff --git a/lldb/test/plugins/builder_base.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py
index c0d5f2a30d5..c0d5f2a30d5 100644
--- a/lldb/test/plugins/builder_base.py
+++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_base.py
diff --git a/lldb/test/plugins/builder_darwin.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_darwin.py
index 3e69995c9a2..3e69995c9a2 100644
--- a/lldb/test/plugins/builder_darwin.py
+++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_darwin.py
diff --git a/lldb/test/plugins/builder_freebsd.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_freebsd.py
index e56be429823..e56be429823 100644
--- a/lldb/test/plugins/builder_freebsd.py
+++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_freebsd.py
diff --git a/lldb/test/plugins/builder_linux2.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py
index e56be429823..e56be429823 100644
--- a/lldb/test/plugins/builder_linux2.py
+++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_linux2.py
diff --git a/lldb/test/plugins/builder_win32.py b/lldb/packages/Python/lldbsuite/test/plugins/builder_win32.py
index e56be429823..e56be429823 100644
--- a/lldb/test/plugins/builder_win32.py
+++ b/lldb/packages/Python/lldbsuite/test/plugins/builder_win32.py
diff --git a/lldb/test/python_api/.categories b/lldb/packages/Python/lldbsuite/test/python_api/.categories
index db8069c3b9f..db8069c3b9f 100644
--- a/lldb/test/python_api/.categories
+++ b/lldb/packages/Python/lldbsuite/test/python_api/.categories
diff --git a/lldb/test/python_api/breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/breakpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/Makefile
diff --git a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
index c70b485a93a..c70b485a93a 100644
--- a/lldb/test/python_api/breakpoint/TestBreakpointAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/TestBreakpointAPI.py
diff --git a/lldb/test/python_api/breakpoint/main.c b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/main.c
index 2677594e622..2677594e622 100644
--- a/lldb/test/python_api/breakpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/breakpoint/main.c
diff --git a/lldb/test/python_api/class_members/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile
index 0d7550f9f28..0d7550f9f28 100644
--- a/lldb/test/python_api/class_members/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/class_members/Makefile
diff --git a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py b/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
index 00b2bcfe0db..00b2bcfe0db 100644
--- a/lldb/test/python_api/class_members/TestSBTypeClassMembers.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/class_members/TestSBTypeClassMembers.py
diff --git a/lldb/test/python_api/class_members/main.mm b/lldb/packages/Python/lldbsuite/test/python_api/class_members/main.mm
index ff61b369ee1..ff61b369ee1 100644
--- a/lldb/test/python_api/class_members/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/python_api/class_members/main.mm
diff --git a/lldb/test/python_api/debugger/TestDebuggerAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
index 40719777bbe..40719777bbe 100644
--- a/lldb/test/python_api/debugger/TestDebuggerAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/debugger/TestDebuggerAPI.py
diff --git a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
index 067d3875cea..067d3875cea 100644
--- a/lldb/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/TestDefaultConstructorForAPIObjects.py
diff --git a/lldb/test/python_api/default-constructor/sb_address.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_address.py
index f0e979543a4..f0e979543a4 100644
--- a/lldb/test/python_api/default-constructor/sb_address.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_address.py
diff --git a/lldb/test/python_api/default-constructor/sb_block.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_block.py
index 3eeb24b4273..3eeb24b4273 100644
--- a/lldb/test/python_api/default-constructor/sb_block.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_block.py
diff --git a/lldb/test/python_api/default-constructor/sb_breakpoint.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpoint.py
index 2c05990edae..2c05990edae 100644
--- a/lldb/test/python_api/default-constructor/sb_breakpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpoint.py
diff --git a/lldb/test/python_api/default-constructor/sb_breakpointlocation.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointlocation.py
index 2251892643b..2251892643b 100644
--- a/lldb/test/python_api/default-constructor/sb_breakpointlocation.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_breakpointlocation.py
diff --git a/lldb/test/python_api/default-constructor/sb_broadcaster.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_broadcaster.py
index 27539e855cd..27539e855cd 100644
--- a/lldb/test/python_api/default-constructor/sb_broadcaster.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_broadcaster.py
diff --git a/lldb/test/python_api/default-constructor/sb_communication.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_communication.py
index d4b90840657..d4b90840657 100644
--- a/lldb/test/python_api/default-constructor/sb_communication.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_communication.py
diff --git a/lldb/test/python_api/default-constructor/sb_compileunit.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_compileunit.py
index 92755ffa395..92755ffa395 100644
--- a/lldb/test/python_api/default-constructor/sb_compileunit.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_compileunit.py
diff --git a/lldb/test/python_api/default-constructor/sb_debugger.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_debugger.py
index e7c188f09ba..e7c188f09ba 100644
--- a/lldb/test/python_api/default-constructor/sb_debugger.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_debugger.py
diff --git a/lldb/test/python_api/default-constructor/sb_error.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_error.py
index 7e069323bf3..7e069323bf3 100644
--- a/lldb/test/python_api/default-constructor/sb_error.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_error.py
diff --git a/lldb/test/python_api/default-constructor/sb_event.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_event.py
index c64f9ba927c..c64f9ba927c 100644
--- a/lldb/test/python_api/default-constructor/sb_event.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_event.py
diff --git a/lldb/test/python_api/default-constructor/sb_filespec.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_filespec.py
index 3aa9235b8a1..3aa9235b8a1 100644
--- a/lldb/test/python_api/default-constructor/sb_filespec.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_filespec.py
diff --git a/lldb/test/python_api/default-constructor/sb_frame.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_frame.py
index 41edaff02ed..41edaff02ed 100644
--- a/lldb/test/python_api/default-constructor/sb_frame.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_frame.py
diff --git a/lldb/test/python_api/default-constructor/sb_function.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_function.py
index fb88d37ac19..fb88d37ac19 100644
--- a/lldb/test/python_api/default-constructor/sb_function.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_function.py
diff --git a/lldb/test/python_api/default-constructor/sb_instruction.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instruction.py
index b961bc389e3..b961bc389e3 100644
--- a/lldb/test/python_api/default-constructor/sb_instruction.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instruction.py
diff --git a/lldb/test/python_api/default-constructor/sb_instructionlist.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instructionlist.py
index 09d62f97048..09d62f97048 100644
--- a/lldb/test/python_api/default-constructor/sb_instructionlist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_instructionlist.py
diff --git a/lldb/test/python_api/default-constructor/sb_lineentry.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_lineentry.py
index d97f2517f4b..d97f2517f4b 100644
--- a/lldb/test/python_api/default-constructor/sb_lineentry.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_lineentry.py
diff --git a/lldb/test/python_api/default-constructor/sb_listener.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_listener.py
index 0747547b9cf..0747547b9cf 100644
--- a/lldb/test/python_api/default-constructor/sb_listener.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_listener.py
diff --git a/lldb/test/python_api/default-constructor/sb_module.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_module.py
index 0b9aa99167a..0b9aa99167a 100644
--- a/lldb/test/python_api/default-constructor/sb_module.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_module.py
diff --git a/lldb/test/python_api/default-constructor/sb_process.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process.py
index 40132b19958..40132b19958 100644
--- a/lldb/test/python_api/default-constructor/sb_process.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_process.py
diff --git a/lldb/test/python_api/default-constructor/sb_section.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_section.py
index 899130abe27..899130abe27 100644
--- a/lldb/test/python_api/default-constructor/sb_section.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_section.py
diff --git a/lldb/test/python_api/default-constructor/sb_stringlist.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_stringlist.py
index 9d8242c9b27..9d8242c9b27 100644
--- a/lldb/test/python_api/default-constructor/sb_stringlist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_stringlist.py
diff --git a/lldb/test/python_api/default-constructor/sb_symbol.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbol.py
index 4a4c67a0880..4a4c67a0880 100644
--- a/lldb/test/python_api/default-constructor/sb_symbol.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbol.py
diff --git a/lldb/test/python_api/default-constructor/sb_symbolcontext.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbolcontext.py
index 01b5b7b793e..01b5b7b793e 100644
--- a/lldb/test/python_api/default-constructor/sb_symbolcontext.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_symbolcontext.py
diff --git a/lldb/test/python_api/default-constructor/sb_target.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_target.py
index 3b01be3e344..3b01be3e344 100644
--- a/lldb/test/python_api/default-constructor/sb_target.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_target.py
diff --git a/lldb/test/python_api/default-constructor/sb_thread.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_thread.py
index b69b22ea6a9..b69b22ea6a9 100644
--- a/lldb/test/python_api/default-constructor/sb_thread.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_thread.py
diff --git a/lldb/test/python_api/default-constructor/sb_type.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_type.py
index 5c801c1fbf2..5c801c1fbf2 100644
--- a/lldb/test/python_api/default-constructor/sb_type.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_type.py
diff --git a/lldb/test/python_api/default-constructor/sb_value.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_value.py
index 2bb8c58e254..2bb8c58e254 100644
--- a/lldb/test/python_api/default-constructor/sb_value.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_value.py
diff --git a/lldb/test/python_api/default-constructor/sb_valuelist.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_valuelist.py
index 32f12f93dd8..32f12f93dd8 100644
--- a/lldb/test/python_api/default-constructor/sb_valuelist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_valuelist.py
diff --git a/lldb/test/python_api/default-constructor/sb_watchpoint.py b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_watchpoint.py
index f462e62ff16..f462e62ff16 100644
--- a/lldb/test/python_api/default-constructor/sb_watchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/default-constructor/sb_watchpoint.py
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
index 131146b83b5..131146b83b5 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassembleRawData.py
diff --git a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
index 310d308c70f..310d308c70f 100644
--- a/lldb/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/disassemble-raw-data/TestDisassemble_VST1_64.py
diff --git a/lldb/test/python_api/event/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/event/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/event/Makefile
diff --git a/lldb/test/python_api/event/TestEvents.py b/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
index f63ac134aab..f63ac134aab 100644
--- a/lldb/test/python_api/event/TestEvents.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/event/TestEvents.py
diff --git a/lldb/test/python_api/event/main.c b/lldb/packages/Python/lldbsuite/test/python_api/event/main.c
index 343526542d7..343526542d7 100644
--- a/lldb/test/python_api/event/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/event/main.c
diff --git a/lldb/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/TestExprPathSynthetic.py
diff --git a/lldb/test/python_api/exprpath_synthetic/main.mm b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm
index f7383a5a14d..f7383a5a14d 100644
--- a/lldb/test/python_api/exprpath_synthetic/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm
diff --git a/lldb/test/python_api/findvalue_duplist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
index ddffdcfb62d..ddffdcfb62d 100644
--- a/lldb/test/python_api/findvalue_duplist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/Makefile
diff --git a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
index 0bc525753fd..0bc525753fd 100644
--- a/lldb/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/TestSBFrameFindValue.py
diff --git a/lldb/test/python_api/findvalue_duplist/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/main.cpp
index 7058d46b04a..7058d46b04a 100644
--- a/lldb/test/python_api/findvalue_duplist/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/findvalue_duplist/main.cpp
diff --git a/lldb/test/python_api/formatters/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
index ddffdcfb62d..ddffdcfb62d 100644
--- a/lldb/test/python_api/formatters/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/Makefile
diff --git a/lldb/test/python_api/formatters/TestFormattersSBAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
index 9c838503802..9c838503802 100644
--- a/lldb/test/python_api/formatters/TestFormattersSBAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/TestFormattersSBAPI.py
diff --git a/lldb/test/python_api/formatters/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/formatters/main.cpp
index f21c956144c..f21c956144c 100644
--- a/lldb/test/python_api/formatters/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/main.cpp
diff --git a/lldb/test/python_api/formatters/synth.py b/lldb/packages/Python/lldbsuite/test/python_api/formatters/synth.py
index 5a30c9a94bb..5a30c9a94bb 100644
--- a/lldb/test/python_api/formatters/synth.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/formatters/synth.py
diff --git a/lldb/test/python_api/frame/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/frame/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/Makefile
diff --git a/lldb/test/python_api/frame/TestFrames.py b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
index 8cc89f67724..8cc89f67724 100644
--- a/lldb/test/python_api/frame/TestFrames.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
diff --git a/lldb/test/python_api/frame/inlines/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile
index 641ee5d96ca..641ee5d96ca 100644
--- a/lldb/test/python_api/frame/inlines/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/Makefile
diff --git a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
index 314cc72cf28..314cc72cf28 100644
--- a/lldb/test/python_api/frame/inlines/TestInlinedFrame.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/TestInlinedFrame.py
diff --git a/lldb/test/python_api/frame/inlines/inlines.c b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.c
index a2a8212278d..a2a8212278d 100644
--- a/lldb/test/python_api/frame/inlines/inlines.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.c
diff --git a/lldb/test/python_api/frame/inlines/inlines.h b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.h
index 265d7b4966e..265d7b4966e 100644
--- a/lldb/test/python_api/frame/inlines/inlines.h
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/inlines/inlines.h
diff --git a/lldb/test/python_api/frame/main.c b/lldb/packages/Python/lldbsuite/test/python_api/frame/main.c
index 35209db1812..35209db1812 100644
--- a/lldb/test/python_api/frame/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/main.c
diff --git a/lldb/test/python_api/function_symbol/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/function_symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/Makefile
diff --git a/lldb/test/python_api/function_symbol/TestDisasmAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
index a967dc85296..a967dc85296 100644
--- a/lldb/test/python_api/function_symbol/TestDisasmAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestDisasmAPI.py
diff --git a/lldb/test/python_api/function_symbol/TestSymbolAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
index 1b49ebc2f15..1b49ebc2f15 100644
--- a/lldb/test/python_api/function_symbol/TestSymbolAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/TestSymbolAPI.py
diff --git a/lldb/test/python_api/function_symbol/main.c b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/main.c
index b60b2faf18d..b60b2faf18d 100644
--- a/lldb/test/python_api/function_symbol/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/function_symbol/main.c
diff --git a/lldb/test/python_api/hello_world/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile
index 9976203b63b..9976203b63b 100644
--- a/lldb/test/python_api/hello_world/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/Makefile
diff --git a/lldb/test/python_api/hello_world/TestHelloWorld.py b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
index 84ad17ab6ee..84ad17ab6ee 100644
--- a/lldb/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
diff --git a/lldb/test/python_api/hello_world/main.c b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c
index 31a041ede74..31a041ede74 100644
--- a/lldb/test/python_api/hello_world/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c
diff --git a/lldb/test/python_api/interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/Makefile
diff --git a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
index e5725674f86..e5725674f86 100644
--- a/lldb/test/python_api/interpreter/TestCommandInterpreterAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/TestCommandInterpreterAPI.py
diff --git a/lldb/test/python_api/interpreter/main.c b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/main.c
index 277aa54a4ee..277aa54a4ee 100644
--- a/lldb/test/python_api/interpreter/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/interpreter/main.c
diff --git a/lldb/test/python_api/lldbutil/frame/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile
index 69b74b5d753..69b74b5d753 100644
--- a/lldb/test/python_api/lldbutil/frame/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile
diff --git a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
index 831c68a2f77..831c68a2f77 100644
--- a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/TestFrameUtils.py
diff --git a/lldb/test/python_api/lldbutil/frame/main.c b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/main.c
index e6eeef5b46d..e6eeef5b46d 100644
--- a/lldb/test/python_api/lldbutil/frame/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/main.c
diff --git a/lldb/test/python_api/lldbutil/iter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile
index 05135412349..05135412349 100644
--- a/lldb/test/python_api/lldbutil/iter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile
diff --git a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
index d8842546268..d8842546268 100644
--- a/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestLLDBIterator.py
diff --git a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
index 6c2dd4e83d2..6c2dd4e83d2 100644
--- a/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
diff --git a/lldb/test/python_api/lldbutil/iter/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/main.cpp
index 8fb45f94b1e..8fb45f94b1e 100644
--- a/lldb/test/python_api/lldbutil/iter/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/main.cpp
diff --git a/lldb/test/python_api/lldbutil/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile
index 93fc28b4ee0..93fc28b4ee0 100644
--- a/lldb/test/python_api/lldbutil/process/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile
diff --git a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
index 0632779b12d..0632779b12d 100644
--- a/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/TestPrintStackTraces.py
diff --git a/lldb/test/python_api/lldbutil/process/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/main.cpp
index 6b87c3d649e..6b87c3d649e 100644
--- a/lldb/test/python_api/lldbutil/process/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/main.cpp
diff --git a/lldb/test/python_api/module_section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile
index ee74ebae1f4..ee74ebae1f4 100644
--- a/lldb/test/python_api/module_section/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile
diff --git a/lldb/test/python_api/module_section/TestModuleAndSection.py b/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
index 5af54537b26..5af54537b26 100644
--- a/lldb/test/python_api/module_section/TestModuleAndSection.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/TestModuleAndSection.py
diff --git a/lldb/test/python_api/module_section/b.cpp b/lldb/packages/Python/lldbsuite/test/python_api/module_section/b.cpp
index 4e3e54138e5..4e3e54138e5 100644
--- a/lldb/test/python_api/module_section/b.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/b.cpp
diff --git a/lldb/test/python_api/module_section/c.cpp b/lldb/packages/Python/lldbsuite/test/python_api/module_section/c.cpp
index 3c87bfe30c6..3c87bfe30c6 100644
--- a/lldb/test/python_api/module_section/c.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/c.cpp
diff --git a/lldb/test/python_api/module_section/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/module_section/main.cpp
index 6b87c3d649e..6b87c3d649e 100644
--- a/lldb/test/python_api/module_section/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/main.cpp
diff --git a/lldb/test/python_api/objc_type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile
index 4562b048d20..4562b048d20 100644
--- a/lldb/test/python_api/objc_type/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/Makefile
diff --git a/lldb/test/python_api/objc_type/TestObjCType.py b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
index f267c4b0eee..f267c4b0eee 100644
--- a/lldb/test/python_api/objc_type/TestObjCType.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/TestObjCType.py
diff --git a/lldb/test/python_api/objc_type/main.m b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/main.m
index f63f0c5040e..f63f0c5040e 100644
--- a/lldb/test/python_api/objc_type/main.m
+++ b/lldb/packages/Python/lldbsuite/test/python_api/objc_type/main.m
diff --git a/lldb/test/python_api/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/python_api/process/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/Makefile
diff --git a/lldb/test/python_api/process/TestProcessAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
index ad007d9e2f0..ad007d9e2f0 100644
--- a/lldb/test/python_api/process/TestProcessAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/TestProcessAPI.py
diff --git a/lldb/test/python_api/process/io/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile
index 5361f2a5bbe..5361f2a5bbe 100644
--- a/lldb/test/python_api/process/io/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/Makefile
diff --git a/lldb/test/python_api/process/io/TestProcessIO.py b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
index def9f5fcd51..def9f5fcd51 100644
--- a/lldb/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
diff --git a/lldb/test/python_api/process/io/main.c b/lldb/packages/Python/lldbsuite/test/python_api/process/io/main.c
index c9a5707f0e1..c9a5707f0e1 100644
--- a/lldb/test/python_api/process/io/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/main.c
diff --git a/lldb/test/python_api/process/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/process/main.cpp
index 9610936e053..9610936e053 100644
--- a/lldb/test/python_api/process/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/main.cpp
diff --git a/lldb/test/python_api/rdar-12481949/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/python_api/rdar-12481949/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Makefile
diff --git a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
index a2a2274a22e..a2a2274a22e 100644
--- a/lldb/test/python_api/rdar-12481949/Test-rdar-12481949.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/Test-rdar-12481949.py
diff --git a/lldb/test/python_api/rdar-12481949/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/main.cpp
index e8ebf36f619..e8ebf36f619 100644
--- a/lldb/test/python_api/rdar-12481949/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/rdar-12481949/main.cpp
diff --git a/lldb/test/python_api/sbdata/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/python_api/sbdata/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/Makefile
diff --git a/lldb/test/python_api/sbdata/TestSBData.py b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
index 536101b9af9..536101b9af9 100644
--- a/lldb/test/python_api/sbdata/TestSBData.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/TestSBData.py
diff --git a/lldb/test/python_api/sbdata/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/main.cpp
index 6018475d83c..6018475d83c 100644
--- a/lldb/test/python_api/sbdata/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbdata/main.cpp
diff --git a/lldb/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
index 356979f0248..356979f0248 100644
--- a/lldb/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/TestSBTypeTypeClass.py
diff --git a/lldb/test/python_api/sbtype_typeclass/main.m b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m
index 599d36107f4..599d36107f4 100644
--- a/lldb/test/python_api/sbtype_typeclass/main.m
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m
diff --git a/lldb/test/python_api/sbvalue_const_addrof/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
index a9c1edd1bdc..a9c1edd1bdc 100644
--- a/lldb/test/python_api/sbvalue_const_addrof/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/Makefile
diff --git a/lldb/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
index a70d2ca7414..a70d2ca7414 100644
--- a/lldb/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/TestSBValueConstAddrOf.py
diff --git a/lldb/test/python_api/sbvalue_const_addrof/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/main.cpp
index eb9c8e0c142..eb9c8e0c142 100644
--- a/lldb/test/python_api/sbvalue_const_addrof/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_const_addrof/main.cpp
diff --git a/lldb/test/python_api/sbvalue_persist/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
index e5c7b915073..e5c7b915073 100644
--- a/lldb/test/python_api/sbvalue_persist/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/Makefile
diff --git a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
index 7e216c034c4..7e216c034c4 100644
--- a/lldb/test/python_api/sbvalue_persist/TestSBValuePersist.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/TestSBValuePersist.py
diff --git a/lldb/test/python_api/sbvalue_persist/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/main.cpp
index 650d87acd6e..650d87acd6e 100644
--- a/lldb/test/python_api/sbvalue_persist/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbvalue_persist/main.cpp
diff --git a/lldb/test/python_api/section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/section/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/section/Makefile
diff --git a/lldb/test/python_api/section/TestSectionAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
index 26002fb3400..26002fb3400 100755..100644
--- a/lldb/test/python_api/section/TestSectionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/section/TestSectionAPI.py
diff --git a/lldb/test/python_api/section/main.c b/lldb/packages/Python/lldbsuite/test/python_api/section/main.c
index 746681d721a..746681d721a 100644
--- a/lldb/test/python_api/section/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/section/main.c
diff --git a/lldb/test/python_api/signals/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/python_api/signals/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/Makefile
diff --git a/lldb/test/python_api/signals/TestSignalsAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
index 3ee42de7870..3ee42de7870 100644
--- a/lldb/test/python_api/signals/TestSignalsAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/TestSignalsAPI.py
diff --git a/lldb/test/python_api/signals/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/signals/main.cpp
index 81924f435a1..81924f435a1 100644
--- a/lldb/test/python_api/signals/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/signals/main.cpp
diff --git a/lldb/test/python_api/symbol-context/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/symbol-context/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/Makefile
diff --git a/lldb/test/python_api/symbol-context/TestSymbolContext.py b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
index 4fb3a8ea6aa..4fb3a8ea6aa 100644
--- a/lldb/test/python_api/symbol-context/TestSymbolContext.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/TestSymbolContext.py
diff --git a/lldb/test/python_api/symbol-context/main.c b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/main.c
index 3ac1825d8d2..3ac1825d8d2 100644
--- a/lldb/test/python_api/symbol-context/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/symbol-context/main.c
diff --git a/lldb/test/python_api/target/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/target/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/target/Makefile
diff --git a/lldb/test/python_api/target/TestTargetAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
index d3367aa6b24..d3367aa6b24 100644
--- a/lldb/test/python_api/target/TestTargetAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/target/TestTargetAPI.py
diff --git a/lldb/test/python_api/target/main.c b/lldb/packages/Python/lldbsuite/test/python_api/target/main.c
index ba82a5437ae..ba82a5437ae 100644
--- a/lldb/test/python_api/target/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/target/main.c
diff --git a/lldb/test/python_api/thread/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile
index aa257ae2bd2..aa257ae2bd2 100644
--- a/lldb/test/python_api/thread/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/Makefile
diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
index 82984205e63..82984205e63 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/TestThreadAPI.py
diff --git a/lldb/test/python_api/thread/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/thread/main.cpp
index 8d806903689..8d806903689 100644
--- a/lldb/test/python_api/thread/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/main.cpp
diff --git a/lldb/test/python_api/thread/main2.cpp b/lldb/packages/Python/lldbsuite/test/python_api/thread/main2.cpp
index a95d7d7aec1..a95d7d7aec1 100644
--- a/lldb/test/python_api/thread/main2.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/thread/main2.cpp
diff --git a/lldb/test/python_api/type/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/python_api/type/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/type/Makefile
diff --git a/lldb/test/python_api/type/TestTypeList.py b/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
index 5c79a9528fc..5c79a9528fc 100644
--- a/lldb/test/python_api/type/TestTypeList.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/type/TestTypeList.py
diff --git a/lldb/test/python_api/type/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/type/main.cpp
index 67b57ace08f..67b57ace08f 100644
--- a/lldb/test/python_api/type/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/type/main.cpp
diff --git a/lldb/test/python_api/value/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/value/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/Makefile
diff --git a/lldb/test/python_api/value/TestValueAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
index 525429b17f9..525429b17f9 100644
--- a/lldb/test/python_api/value/TestValueAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/TestValueAPI.py
diff --git a/lldb/test/python_api/value/change_values/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile
index b09a579159d..b09a579159d 100644
--- a/lldb/test/python_api/value/change_values/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/Makefile
diff --git a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
index 18c34d3af71..18c34d3af71 100644
--- a/lldb/test/python_api/value/change_values/TestChangeValueAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/TestChangeValueAPI.py
diff --git a/lldb/test/python_api/value/change_values/main.c b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/main.c
index 01455c01964..01455c01964 100644
--- a/lldb/test/python_api/value/change_values/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/change_values/main.c
diff --git a/lldb/test/python_api/value/linked_list/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/python_api/value/linked_list/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/Makefile
diff --git a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
index c62c130d9c4..c62c130d9c4 100644
--- a/lldb/test/python_api/value/linked_list/TestValueAPILinkedList.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/TestValueAPILinkedList.py
diff --git a/lldb/test/python_api/value/linked_list/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/main.cpp
index 50517f48774..50517f48774 100644
--- a/lldb/test/python_api/value/linked_list/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/linked_list/main.cpp
diff --git a/lldb/test/python_api/value/main.c b/lldb/packages/Python/lldbsuite/test/python_api/value/main.c
index a00795750de..a00795750de 100644
--- a/lldb/test/python_api/value/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value/main.c
diff --git a/lldb/test/python_api/value_var_update/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile
index 4b0e5814e3e..4b0e5814e3e 100644
--- a/lldb/test/python_api/value_var_update/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/Makefile
diff --git a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
index b7f53c160c6..b7f53c160c6 100644
--- a/lldb/test/python_api/value_var_update/TestValueVarUpdate.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/TestValueVarUpdate.py
diff --git a/lldb/test/python_api/value_var_update/main.c b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/main.c
index 9ffca5cbb9f..9ffca5cbb9f 100644
--- a/lldb/test/python_api/value_var_update/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/value_var_update/main.c
diff --git a/lldb/test/python_api/watchpoint/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/python_api/watchpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/Makefile
diff --git a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
index 2e513a510f5..2e513a510f5 100644
--- a/lldb/test/python_api/watchpoint/TestSetWatchpoint.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestSetWatchpoint.py
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
index b2cb8de82d7..b2cb8de82d7 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIgnoreCount.py
diff --git a/lldb/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
index c7bc94d859f..c7bc94d859f 100644
--- a/lldb/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
diff --git a/lldb/test/python_api/watchpoint/condition/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/python_api/watchpoint/condition/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/Makefile
diff --git a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
index 8d0b4af8fe2..8d0b4af8fe2 100644
--- a/lldb/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/TestWatchpointConditionAPI.py
diff --git a/lldb/test/python_api/watchpoint/condition/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/main.cpp
index f4c3527f8af..f4c3527f8af 100644
--- a/lldb/test/python_api/watchpoint/condition/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/condition/main.cpp
diff --git a/lldb/test/python_api/watchpoint/main.c b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/main.c
index 4753edfba99..4753edfba99 100644
--- a/lldb/test/python_api/watchpoint/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/main.c
diff --git a/lldb/test/python_api/watchpoint/watchlocation/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
index 7fef897c059..7fef897c059 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/Makefile
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
index 016ca78e90d..016ca78e90d 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestSetWatchlocation.py
diff --git a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
index 28a8f809bb1..28a8f809bb1 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/TestTargetWatchAddress.py
diff --git a/lldb/test/python_api/watchpoint/watchlocation/main.cpp b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/main.cpp
index a197a92a481..a197a92a481 100644
--- a/lldb/test/python_api/watchpoint/watchlocation/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/watchlocation/main.cpp
diff --git a/lldb/test/redo.py b/lldb/packages/Python/lldbsuite/test/redo.py
index e4eba8b2786..e4eba8b2786 100755..100644
--- a/lldb/test/redo.py
+++ b/lldb/packages/Python/lldbsuite/test/redo.py
diff --git a/lldb/test/settings/Makefile b/lldb/packages/Python/lldbsuite/test/settings/Makefile
index d4bc9c68904..d4bc9c68904 100644
--- a/lldb/test/settings/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/settings/Makefile
diff --git a/lldb/test/settings/TestSettings.py b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
index da30201f100..da30201f100 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/TestSettings.py
diff --git a/lldb/test/settings/main.cpp b/lldb/packages/Python/lldbsuite/test/settings/main.cpp
index cf2b16b0089..cf2b16b0089 100644
--- a/lldb/test/settings/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/settings/main.cpp
diff --git a/lldb/test/settings/quoting/Makefile b/lldb/packages/Python/lldbsuite/test/settings/quoting/Makefile
index 0d70f259501..0d70f259501 100644
--- a/lldb/test/settings/quoting/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/Makefile
diff --git a/lldb/test/settings/quoting/TestQuoting.py b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
index 91a143f70cd..91a143f70cd 100644
--- a/lldb/test/settings/quoting/TestQuoting.py
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/TestQuoting.py
diff --git a/lldb/test/settings/quoting/main.c b/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
index 6e01c2d1cd8..6e01c2d1cd8 100644
--- a/lldb/test/settings/quoting/main.c
+++ b/lldb/packages/Python/lldbsuite/test/settings/quoting/main.c
diff --git a/lldb/test/source-manager/Makefile b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile
index d6cd0db0506..d6cd0db0506 100644
--- a/lldb/test/source-manager/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/Makefile
diff --git a/lldb/test/source-manager/TestSourceManager.py b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
index 1fc6cd19cab..1fc6cd19cab 100644
--- a/lldb/test/source-manager/TestSourceManager.py
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/TestSourceManager.py
diff --git a/lldb/test/source-manager/hidden/.keep b/lldb/packages/Python/lldbsuite/test/source-manager/hidden/.keep
index e69de29bb2d..e69de29bb2d 100644
--- a/lldb/test/source-manager/hidden/.keep
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/hidden/.keep
diff --git a/lldb/test/source-manager/main.c b/lldb/packages/Python/lldbsuite/test/source-manager/main.c
index 9f62166357c..9f62166357c 100644
--- a/lldb/test/source-manager/main.c
+++ b/lldb/packages/Python/lldbsuite/test/source-manager/main.c
diff --git a/lldb/test/terminal/TestSTTYBeforeAndAfter.py b/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
index 4032f023c34..4032f023c34 100644
--- a/lldb/test/terminal/TestSTTYBeforeAndAfter.py
+++ b/lldb/packages/Python/lldbsuite/test/terminal/TestSTTYBeforeAndAfter.py
diff --git a/lldb/test/test_categories.py b/lldb/packages/Python/lldbsuite/test/test_categories.py
index 6fa3e4bd593..6fa3e4bd593 100644
--- a/lldb/test/test_categories.py
+++ b/lldb/packages/Python/lldbsuite/test/test_categories.py
diff --git a/lldb/test/test_results.py b/lldb/packages/Python/lldbsuite/test/test_results.py
index 17dcc209c4a..17dcc209c4a 100644
--- a/lldb/test/test_results.py
+++ b/lldb/packages/Python/lldbsuite/test/test_results.py
diff --git a/lldb/test/test_runner/README.txt b/lldb/packages/Python/lldbsuite/test/test_runner/README.txt
index bb40870e796..bb40870e796 100644
--- a/lldb/test/test_runner/README.txt
+++ b/lldb/packages/Python/lldbsuite/test/test_runner/README.txt
diff --git a/lldb/test/test_runner/lib/lldb_utils.py b/lldb/packages/Python/lldbsuite/test/test_runner/lib/lldb_utils.py
index e469bbf1220..e469bbf1220 100644
--- a/lldb/test/test_runner/lib/lldb_utils.py
+++ b/lldb/packages/Python/lldbsuite/test/test_runner/lib/lldb_utils.py
diff --git a/lldb/test/test_runner/lib/process_control.py b/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py
index ba30840147e..ba30840147e 100644
--- a/lldb/test/test_runner/lib/process_control.py
+++ b/lldb/packages/Python/lldbsuite/test/test_runner/lib/process_control.py
diff --git a/lldb/test/test_runner/test/inferior.py b/lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py
index 4207bac300f..4207bac300f 100644
--- a/lldb/test/test_runner/test/inferior.py
+++ b/lldb/packages/Python/lldbsuite/test/test_runner/test/inferior.py
diff --git a/lldb/test/test_runner/test/process_control_tests.py b/lldb/packages/Python/lldbsuite/test/test_runner/test/process_control_tests.py
index 354506d6581..354506d6581 100644
--- a/lldb/test/test_runner/test/process_control_tests.py
+++ b/lldb/packages/Python/lldbsuite/test/test_runner/test/process_control_tests.py
diff --git a/lldb/test/tools/lldb-mi/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/tools/lldb-mi/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/Makefile
diff --git a/lldb/test/tools/lldb-mi/TestMiExit.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
index 038710e8c5b..038710e8c5b 100644
--- a/lldb/test/tools/lldb-mi/TestMiExit.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiExit.py
diff --git a/lldb/test/tools/lldb-mi/TestMiFile.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
index c48119c8c0b..c48119c8c0b 100644
--- a/lldb/test/tools/lldb-mi/TestMiFile.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiFile.py
diff --git a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
index a3f54239e68..a3f54239e68 100644
--- a/lldb/test/tools/lldb-mi/TestMiGdbSetShow.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiGdbSetShow.py
diff --git a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
index caf9a49d47b..caf9a49d47b 100644
--- a/lldb/test/tools/lldb-mi/TestMiLibraryLoaded.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiLibraryLoaded.py
diff --git a/lldb/test/tools/lldb-mi/TestMiPrompt.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
index 4f9e2ac7b0d..4f9e2ac7b0d 100644
--- a/lldb/test/tools/lldb-mi/TestMiPrompt.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/TestMiPrompt.py
diff --git a/lldb/test/tools/lldb-mi/breakpoint/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/breakpoint/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/Makefile
diff --git a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
index 056dd29b57a..056dd29b57a 100644
--- a/lldb/test/tools/lldb-mi/breakpoint/TestMiBreak.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/TestMiBreak.py
diff --git a/lldb/test/tools/lldb-mi/breakpoint/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/main.cpp
index 9416a0d01c7..9416a0d01c7 100644
--- a/lldb/test/tools/lldb-mi/breakpoint/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/breakpoint/main.cpp
diff --git a/lldb/test/tools/lldb-mi/control/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/control/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/Makefile
diff --git a/lldb/test/tools/lldb-mi/control/TestMiExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
index 11f4e6374c0..11f4e6374c0 100644
--- a/lldb/test/tools/lldb-mi/control/TestMiExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/TestMiExec.py
diff --git a/lldb/test/tools/lldb-mi/control/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/main.cpp
index ae0c3d9800a..ae0c3d9800a 100644
--- a/lldb/test/tools/lldb-mi/control/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/control/main.cpp
diff --git a/lldb/test/tools/lldb-mi/data/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/data/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/Makefile
diff --git a/lldb/test/tools/lldb-mi/data/TestMiData.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
index 94e5042b3bf..94e5042b3bf 100644
--- a/lldb/test/tools/lldb-mi/data/TestMiData.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/TestMiData.py
diff --git a/lldb/test/tools/lldb-mi/data/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/main.cpp
index 8030fe891de..8030fe891de 100644
--- a/lldb/test/tools/lldb-mi/data/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/data/main.cpp
diff --git a/lldb/test/tools/lldb-mi/interpreter/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/interpreter/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/Makefile
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
index 594b7595e1c..594b7595e1c 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiCliSupport.py
diff --git a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
index ccdc64213b8..ccdc64213b8 100644
--- a/lldb/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/TestMiInterpreterExec.py
diff --git a/lldb/test/tools/lldb-mi/interpreter/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/main.cpp
index 0c042d46698..0c042d46698 100644
--- a/lldb/test/tools/lldb-mi/interpreter/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/interpreter/main.cpp
diff --git a/lldb/test/tools/lldb-mi/lldbmi_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
index 944dca0af5e..944dca0af5e 100644
--- a/lldb/test/tools/lldb-mi/lldbmi_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/lldbmi_testcase.py
diff --git a/lldb/test/tools/lldb-mi/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/main.cpp
index 6a2079f2ce7..6a2079f2ce7 100644
--- a/lldb/test/tools/lldb-mi/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/main.cpp
diff --git a/lldb/test/tools/lldb-mi/signal/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/signal/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/Makefile
diff --git a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
index d3f22c5ff0f..d3f22c5ff0f 100644
--- a/lldb/test/tools/lldb-mi/signal/TestMiSignal.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/TestMiSignal.py
diff --git a/lldb/test/tools/lldb-mi/signal/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/main.cpp
index 7f6eeca70c0..7f6eeca70c0 100644
--- a/lldb/test/tools/lldb-mi/signal/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/signal/main.cpp
diff --git a/lldb/test/tools/lldb-mi/stack/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/stack/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/Makefile
diff --git a/lldb/test/tools/lldb-mi/stack/TestMiStack.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
index 1126f698c04..1126f698c04 100644
--- a/lldb/test/tools/lldb-mi/stack/TestMiStack.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/TestMiStack.py
diff --git a/lldb/test/tools/lldb-mi/stack/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/main.cpp
index e11f83e108e..e11f83e108e 100644
--- a/lldb/test/tools/lldb-mi/stack/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/stack/main.cpp
diff --git a/lldb/test/tools/lldb-mi/startup_options/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/startup_options/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/Makefile
diff --git a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
index 5f07e337cdf..5f07e337cdf 100644
--- a/lldb/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/TestMiStartupOptions.py
diff --git a/lldb/test/tools/lldb-mi/startup_options/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/main.cpp
index 7f2d5246faf..7f2d5246faf 100644
--- a/lldb/test/tools/lldb-mi/startup_options/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/main.cpp
diff --git a/lldb/test/tools/lldb-mi/startup_options/start_script b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script
index 511c0224825..511c0224825 100644
--- a/lldb/test/tools/lldb-mi/startup_options/start_script
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script
diff --git a/lldb/test/tools/lldb-mi/startup_options/start_script_error b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script_error
index d834e7407c5..d834e7407c5 100644
--- a/lldb/test/tools/lldb-mi/startup_options/start_script_error
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script_error
diff --git a/lldb/test/tools/lldb-mi/startup_options/start_script_exit b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script_exit
index 8379018c29d..8379018c29d 100644
--- a/lldb/test/tools/lldb-mi/startup_options/start_script_exit
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/startup_options/start_script_exit
diff --git a/lldb/test/tools/lldb-mi/symbol/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/Makefile
index dde38f4e486..dde38f4e486 100644
--- a/lldb/test/tools/lldb-mi/symbol/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/Makefile
diff --git a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
index 8bbe552c6d5..8bbe552c6d5 100644
--- a/lldb/test/tools/lldb-mi/symbol/TestMiSymbol.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/TestMiSymbol.py
diff --git a/lldb/test/tools/lldb-mi/symbol/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/main.cpp
index 6d725a5759b..6d725a5759b 100644
--- a/lldb/test/tools/lldb-mi/symbol/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/main.cpp
diff --git a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.cpp
index c432ba8c477..c432ba8c477 100644
--- a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.cpp
diff --git a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.h b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.h
index 1608642b0b3..1608642b0b3 100644
--- a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.h
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test.h
diff --git a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test2.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test2.cpp
index cfedf47ad6b..cfedf47ad6b 100644
--- a/lldb/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test2.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/symbol/symbol_list_lines_inline_test2.cpp
diff --git a/lldb/test/tools/lldb-mi/syntax/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/syntax/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/Makefile
diff --git a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
index df40a81b4ec..df40a81b4ec 100644
--- a/lldb/test/tools/lldb-mi/syntax/TestMiSyntax.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/TestMiSyntax.py
diff --git a/lldb/test/tools/lldb-mi/syntax/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/main.cpp
index d2935b08f87..d2935b08f87 100644
--- a/lldb/test/tools/lldb-mi/syntax/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/syntax/main.cpp
diff --git a/lldb/test/tools/lldb-mi/target/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/Makefile
index b2550fe780d..b2550fe780d 100644
--- a/lldb/test/tools/lldb-mi/target/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/Makefile
diff --git a/lldb/test/tools/lldb-mi/target/TestMiTarget.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
index d10051b4421..d10051b4421 100644
--- a/lldb/test/tools/lldb-mi/target/TestMiTarget.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/TestMiTarget.py
diff --git a/lldb/test/tools/lldb-mi/target/test_attach.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/test_attach.cpp
index caaf33a46fa..caaf33a46fa 100644
--- a/lldb/test/tools/lldb-mi/target/test_attach.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/target/test_attach.cpp
diff --git a/lldb/test/tools/lldb-mi/variable/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/Makefile
index 314f1cb2f07..314f1cb2f07 100644
--- a/lldb/test/tools/lldb-mi/variable/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/Makefile
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
index a6e08780f36..a6e08780f36 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiGdbSetShowPrint.py
diff --git a/lldb/test/tools/lldb-mi/variable/TestMiVar.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
index d4973e4663f..d4973e4663f 100644
--- a/lldb/test/tools/lldb-mi/variable/TestMiVar.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/TestMiVar.py
diff --git a/lldb/test/tools/lldb-mi/variable/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/main.cpp
index 8c79539d4d8..8c79539d4d8 100644
--- a/lldb/test/tools/lldb-mi/variable/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-mi/variable/main.cpp
diff --git a/lldb/test/tools/lldb-server/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile
index 6ae4e6624ee..6ae4e6624ee 100644
--- a/lldb/test/tools/lldb-server/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile
diff --git a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
index 8ec7fd6f1e6..8ec7fd6f1e6 100644
--- a/lldb/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGDBRemoteMemoryRead.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
index 9667c76609a..9667c76609a 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAttach.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index 5ca05ea888e..5ca05ea888e 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteAuxvSupport.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index e9259182023..e9259182023 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
index a6f1d14ad6c..a6f1d14ad6c 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 9c2363ac4da..9c2363ac4da 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteProcessInfo.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
index ef2f3ca179e..ef2f3ca179e 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteRegisterState.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
index 0155af52f9f..0155af52f9f 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteSingleStep.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index e0ca9b15142..e0ca9b15142 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 084bb44fb62..084bb44fb62 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
diff --git a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
index 267ce65d1c6..267ce65d1c6 100644
--- a/lldb/test/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_vCont.py
diff --git a/lldb/test/tools/lldb-server/TestLldbGdbServer.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
index a254269e25f..a254269e25f 100644
--- a/lldb/test/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestLldbGdbServer.py
diff --git a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
index f37da8f54f1..f37da8f54f1 100644
--- a/lldb/test/tools/lldb-server/commandline/TestStubReverseConnect.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubReverseConnect.py
diff --git a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
index 68d2b2ffa56..68d2b2ffa56 100644
--- a/lldb/test/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/commandline/TestStubSetSID.py
diff --git a/lldb/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index 8da1fda2d52..8da1fda2d52 100644
--- a/lldb/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
diff --git a/lldb/test/tools/lldb-server/inferior-crash/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile
index a47e2797fd8..a47e2797fd8 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 1f00a7d3594..1f00a7d3594 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
diff --git a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index 7b3186b9a7c..7b3186b9a7c 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
diff --git a/lldb/test/tools/lldb-server/inferior-crash/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/main.cpp
index 69d60071aa4..69d60071aa4 100644
--- a/lldb/test/tools/lldb-server/inferior-crash/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/main.cpp
diff --git a/lldb/test/tools/lldb-server/lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
index 8014a79550b..8014a79550b 100644
--- a/lldb/test/tools/lldb-server/lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/lldbgdbserverutils.py
diff --git a/lldb/test/tools/lldb-server/main.cpp b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/main.cpp
index c65b2257159..c65b2257159 100644
--- a/lldb/test/tools/lldb-server/main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/main.cpp
diff --git a/lldb/test/tools/lldb-server/socket_packet_pump.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
index 1fd52bc0f26..1fd52bc0f26 100644
--- a/lldb/test/tools/lldb-server/socket_packet_pump.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/socket_packet_pump.py
diff --git a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py
index e21191f0ee4..e21191f0ee4 100644
--- a/lldb/test/tools/lldb-server/test/test_lldbgdbserverutils.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/test/test_lldbgdbserverutils.py
diff --git a/lldb/test/types/AbstractBase.py b/lldb/packages/Python/lldbsuite/test/types/AbstractBase.py
index 7b78fd7561b..7b78fd7561b 100644
--- a/lldb/test/types/AbstractBase.py
+++ b/lldb/packages/Python/lldbsuite/test/types/AbstractBase.py
diff --git a/lldb/test/types/HideTestFailures.py b/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py
index 77a04fe23d1..77a04fe23d1 100644
--- a/lldb/test/types/HideTestFailures.py
+++ b/lldb/packages/Python/lldbsuite/test/types/HideTestFailures.py
diff --git a/lldb/test/types/Makefile b/lldb/packages/Python/lldbsuite/test/types/Makefile
index c1b4cb32561..c1b4cb32561 100644
--- a/lldb/test/types/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/types/Makefile
diff --git a/lldb/test/types/TestFloatTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py
index 133b98dae15..133b98dae15 100644
--- a/lldb/test/types/TestFloatTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypes.py
diff --git a/lldb/test/types/TestFloatTypesExpr.py b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
index 64f01976e3e..64f01976e3e 100644
--- a/lldb/test/types/TestFloatTypesExpr.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestFloatTypesExpr.py
diff --git a/lldb/test/types/TestIntegerTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
index bf1cd5c7958..bf1cd5c7958 100644
--- a/lldb/test/types/TestIntegerTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypes.py
diff --git a/lldb/test/types/TestIntegerTypesExpr.py b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
index 27105c87c97..27105c87c97 100644
--- a/lldb/test/types/TestIntegerTypesExpr.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestIntegerTypesExpr.py
diff --git a/lldb/test/types/TestRecursiveTypes.py b/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
index e394177587a..e394177587a 100644
--- a/lldb/test/types/TestRecursiveTypes.py
+++ b/lldb/packages/Python/lldbsuite/test/types/TestRecursiveTypes.py
diff --git a/lldb/test/types/basic_type.cpp b/lldb/packages/Python/lldbsuite/test/types/basic_type.cpp
index 1651815fa0c..1651815fa0c 100644
--- a/lldb/test/types/basic_type.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/basic_type.cpp
diff --git a/lldb/test/types/char.cpp b/lldb/packages/Python/lldbsuite/test/types/char.cpp
index 584582ed9b9..584582ed9b9 100644
--- a/lldb/test/types/char.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/char.cpp
diff --git a/lldb/test/types/double.cpp b/lldb/packages/Python/lldbsuite/test/types/double.cpp
index 6788dadfe02..6788dadfe02 100644
--- a/lldb/test/types/double.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/double.cpp
diff --git a/lldb/test/types/float.cpp b/lldb/packages/Python/lldbsuite/test/types/float.cpp
index 4bc124661aa..4bc124661aa 100644
--- a/lldb/test/types/float.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/float.cpp
diff --git a/lldb/test/types/int.cpp b/lldb/packages/Python/lldbsuite/test/types/int.cpp
index 922398b1c6e..922398b1c6e 100644
--- a/lldb/test/types/int.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/int.cpp
diff --git a/lldb/test/types/long.cpp b/lldb/packages/Python/lldbsuite/test/types/long.cpp
index 9056b42ee77..9056b42ee77 100644
--- a/lldb/test/types/long.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/long.cpp
diff --git a/lldb/test/types/long_long.cpp b/lldb/packages/Python/lldbsuite/test/types/long_long.cpp
index 5b442e7257e..5b442e7257e 100644
--- a/lldb/test/types/long_long.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/long_long.cpp
diff --git a/lldb/test/types/recursive_type_1.cpp b/lldb/packages/Python/lldbsuite/test/types/recursive_type_1.cpp
index 81d923ffd94..81d923ffd94 100644
--- a/lldb/test/types/recursive_type_1.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/recursive_type_1.cpp
diff --git a/lldb/test/types/recursive_type_2.cpp b/lldb/packages/Python/lldbsuite/test/types/recursive_type_2.cpp
index 304739049a0..304739049a0 100644
--- a/lldb/test/types/recursive_type_2.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/recursive_type_2.cpp
diff --git a/lldb/test/types/recursive_type_main.cpp b/lldb/packages/Python/lldbsuite/test/types/recursive_type_main.cpp
index e06cd309be3..e06cd309be3 100644
--- a/lldb/test/types/recursive_type_main.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/recursive_type_main.cpp
diff --git a/lldb/test/types/short.cpp b/lldb/packages/Python/lldbsuite/test/types/short.cpp
index 470c68aa8ba..470c68aa8ba 100644
--- a/lldb/test/types/short.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/short.cpp
diff --git a/lldb/test/types/unsigned_char.cpp b/lldb/packages/Python/lldbsuite/test/types/unsigned_char.cpp
index 0ac555a5a18..0ac555a5a18 100644
--- a/lldb/test/types/unsigned_char.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/unsigned_char.cpp
diff --git a/lldb/test/types/unsigned_int.cpp b/lldb/packages/Python/lldbsuite/test/types/unsigned_int.cpp
index 1b307b04afc..1b307b04afc 100644
--- a/lldb/test/types/unsigned_int.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/unsigned_int.cpp
diff --git a/lldb/test/types/unsigned_long.cpp b/lldb/packages/Python/lldbsuite/test/types/unsigned_long.cpp
index 0c442e399d5..0c442e399d5 100644
--- a/lldb/test/types/unsigned_long.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/unsigned_long.cpp
diff --git a/lldb/test/types/unsigned_long_long.cpp b/lldb/packages/Python/lldbsuite/test/types/unsigned_long_long.cpp
index 648aad01b3a..648aad01b3a 100644
--- a/lldb/test/types/unsigned_long_long.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/unsigned_long_long.cpp
diff --git a/lldb/test/types/unsigned_short.cpp b/lldb/packages/Python/lldbsuite/test/types/unsigned_short.cpp
index 09af2aad62c..09af2aad62c 100644
--- a/lldb/test/types/unsigned_short.cpp
+++ b/lldb/packages/Python/lldbsuite/test/types/unsigned_short.cpp
diff --git a/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py b/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py
new file mode 100644
index 00000000000..3dbcbb91700
--- /dev/null
+++ b/lldb/packages/Python/lldbsuite/test/use_lldb_suite.py
@@ -0,0 +1,22 @@
+import inspect
+import os
+import sys
+
+def find_lldb_root():
+    lldb_root = os.path.dirname(inspect.getfile(inspect.currentframe()))
+    while True:
+        lldb_root = os.path.dirname(lldb_root)
+        if lldb_root is None:
+            return None
+
+        test_path = os.path.join(lldb_root, "lldb.root")
+        if os.path.isfile(test_path):
+            return lldb_root
+    return None
+
+lldb_root = find_lldb_root()
+if lldb_root is not None:
+    import imp
+    module = imp.find_module("use_lldb_suite_root", [lldb_root])
+    if module is not None:
+        imp.load_module("use_lldb_suite_root", *module)
diff --git a/lldb/test/warnings/uuid/Makefile b/lldb/packages/Python/lldbsuite/test/warnings/uuid/Makefile
index 8a7102e347a..8a7102e347a 100644
--- a/lldb/test/warnings/uuid/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/warnings/uuid/Makefile
diff --git a/lldb/test/warnings/uuid/TestAddDsymCommand.py b/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
index 8e5d31a7226..8e5d31a7226 100644
--- a/lldb/test/warnings/uuid/TestAddDsymCommand.py
+++ b/lldb/packages/Python/lldbsuite/test/warnings/uuid/TestAddDsymCommand.py
diff --git a/lldb/test/warnings/uuid/main.cpp.template b/lldb/packages/Python/lldbsuite/test/warnings/uuid/main.cpp.template
index d952c9686b5..d952c9686b5 100644
--- a/lldb/test/warnings/uuid/main.cpp.template
+++ b/lldb/packages/Python/lldbsuite/test/warnings/uuid/main.cpp.template
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 2571af20127..d5ebe41d432 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -1,2039 +1,4 @@
-#!/usr/bin/env python
-
-"""
-A simple testing framework for lldb using python's unit testing framework.
-
-Tests for lldb are written as python scripts which take advantage of the script
-bridging provided by LLDB.framework to interact with lldb core.
-
-A specific naming pattern is followed by the .py script to be recognized as
-a module which implements a test scenario, namely, Test*.py.
-
-To specify the directories where "Test*.py" python test scripts are located,
-you need to pass in a list of directory names.  By default, the current
-working directory is searched if nothing is specified on the command line.
-
-Type:
-
-./dotest.py -h
-
-for available options.
-"""
-
-from __future__ import print_function
-
 import use_lldb_suite
 
-import atexit
-import commands
-import importlib
-import os
-import dotest_args
-import errno
-import platform
-import progress
-import signal
-import socket
-import subprocess
-import sys
-import test_results
-from test_results import EventBuilder
-import inspect
-import unittest2
-import lldbtest_config
-import test_categories
-
-import six
-
-def is_exe(fpath):
-    """Returns true if fpath is an executable."""
-    return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-def which(program):
-    """Returns the full path to a program; None otherwise."""
-    fpath, fname = os.path.split(program)
-    if fpath:
-        if is_exe(program):
-            return program
-    else:
-        for path in os.environ["PATH"].split(os.pathsep):
-            exe_file = os.path.join(path, program)
-            if is_exe(exe_file):
-                return exe_file
-    return None
-
-class _WritelnDecorator(object):
-    """Used to decorate file-like objects with a handy 'writeln' method"""
-    def __init__(self,stream):
-        self.stream = stream
-
-    def __getattr__(self, attr):
-        if attr in ('stream', '__getstate__'):
-            raise AttributeError(attr)
-        return getattr(self.stream,attr)
-
-    def writeln(self, arg=None):
-        if arg:
-            self.write(arg)
-        self.write('\n') # text-mode streams translate to \r\n if needed
-
-#
-# Global variables:
-#
-
-# The test suite.
-suite = unittest2.TestSuite()
-
-# By default, benchmarks tests are not run.
-just_do_benchmarks_test = False
-
-dont_do_dsym_test = False
-dont_do_dwarf_test = False
-dont_do_dwo_test = False
-
-# The blacklist is optional (-b blacklistFile) and allows a central place to skip
-# testclass's and/or testclass.testmethod's.
-blacklist = None
-
-# The dictionary as a result of sourcing blacklistFile.
-blacklistConfig = {}
-
-# The list of categories we said we care about
-categoriesList = None
-# set to true if we are going to use categories for cherry-picking test cases
-useCategories = False
-# Categories we want to skip
-skipCategories = []
-# use this to track per-category failures
-failuresPerCategory = {}
-
-# The path to LLDB.framework is optional.
-lldbFrameworkPath = None
-
-# The config file is optional.
-configFile = None
-
-# Test suite repeat count.  Can be overwritten with '-# count'.
-count = 1
-
-# The dictionary as a result of sourcing configFile.
-config = {}
-# The pre_flight and post_flight functions come from reading a config file.
-pre_flight = None
-post_flight = None
-# So do the lldbtest_remote_sandbox and lldbtest_remote_shell_template variables.
-lldbtest_remote_sandbox = None
-lldbtest_remote_shell_template = None
-
-# The 'archs' and 'compilers' can be specified via either command line or configFile,
-# with the command line overriding the configFile.  The corresponding options can be
-# specified more than once. For example, "-A x86_64 -A i386" => archs=['x86_64', 'i386']
-# and "-C gcc -C clang" => compilers=['gcc', 'clang'].
-archs = None        # Must be initialized after option parsing
-compilers = None    # Must be initialized after option parsing
-
-# The arch might dictate some specific CFLAGS to be passed to the toolchain to build
-# the inferior programs.  The global variable cflags_extras provides a hook to do
-# just that.
-cflags_extras = ''
-
-# Dump the Python sys.path variable.  Use '-D' to dump sys.path.
-dumpSysPath = False
-
-# Full path of the benchmark executable, as specified by the '-e' option.
-bmExecutable = None
-# The breakpoint specification of bmExecutable, as specified by the '-x' option.
-bmBreakpointSpec = None
-# The benchmark iteration count, as specified by the '-y' option.
-bmIterationCount = -1
-
-# By default, don't exclude any directories.  Use '-X' to add one excluded directory.
-excluded = set(['.svn', '.git'])
-
-# By default, failfast is False.  Use '-F' to overwrite it.
-failfast = False
-
-# The filters (testclass.testmethod) used to admit tests into our test suite.
-filters = []
-
-# The runhooks is a list of lldb commands specifically for the debugger.
-# Use '-k' to specify a runhook.
-runHooks = []
-
-# If '-g' is specified, the filterspec is not exclusive.  If a test module does
-# not contain testclass.testmethod which matches the filterspec, the whole test
-# module is still admitted into our test suite.  fs4all flag defaults to True.
-fs4all = True
-
-# Ignore the build search path relative to this script to locate the lldb.py module.
-ignore = False
-
-# By default, we do not skip build and cleanup.  Use '-S' option to override.
-skip_build_and_cleanup = False
-
-# By default, we skip long running test case.  Use '-l' option to override.
-skip_long_running_test = True
-
-# By default, we print the build dir, lldb version, and svn info.  Use '-n' option to
-# turn it off.
-noHeaders = False
-
-# Parsable mode silences headers, and any other output this script might generate, and instead
-# prints machine-readable output similar to what clang tests produce.
-parsable = False
-
-# The regular expression pattern to match against eligible filenames as our test cases.
-regexp = None
-
-# By default, tests are executed in place and cleanups are performed afterwards.
-# Use '-r dir' option to relocate the tests and their intermediate files to a
-# different directory and to forgo any cleanups.  The directory specified must
-# not exist yet.
-rdir = None
-
-# By default, recorded session info for errored/failed test are dumped into its
-# own file under a session directory named after the timestamp of the test suite
-# run.  Use '-s session-dir-name' to specify a specific dir name.
-sdir_name = None
-
-# Set this flag if there is any session info dumped during the test run.
-sdir_has_content = False
-
-# svn_info stores the output from 'svn info lldb.base.dir'.
-svn_info = ''
-
-# svn_silent means do not try to obtain svn status
-svn_silent = True
-
-# Default verbosity is 0.
-verbose = 1
-
-# Set to True only if verbose is 0 and LLDB trace mode is off.
-progress_bar = False
-
-# By default, search from the script directory.
-# We can't use sys.path[0] to determine the script directory
-# because it doesn't work under a debugger
-testdirs = [ os.path.dirname(os.path.realpath(__file__)) ]
-
-# Separator string.
-separator = '-' * 70
-
-failed = False
-
-# LLDB Remote platform setting
-lldb_platform_name = None
-lldb_platform_url = None
-lldb_platform_working_dir = None
-
-# Parallel execution settings
-is_inferior_test_runner = False
-multiprocess_test_subdir = None
-num_threads = None
-output_on_success = False
-no_multiprocess_test_runner = False
-test_runner_name = None
-
-# Test results handling globals
-results_filename = None
-results_port = None
-results_file_object = None
-results_formatter_name = None
-results_formatter_object = None
-results_formatter_options = None
-
-# The names of all tests. Used to assert we don't have two tests with the same base name.
-all_tests = set()
-
-def usage(parser):
-    parser.print_help()
-    if verbose > 0:
-        print("""
-Examples:
-
-This is an example of using the -f option to pinpoint to a specific test class
-and test method to be run:
-
-$ ./dotest.py -f ClassTypesTestCase.test_with_dsym_and_run_command
-----------------------------------------------------------------------
-Collected 1 test
-
-test_with_dsym_and_run_command (TestClassTypes.ClassTypesTestCase)
-Test 'frame variable this' when stopped on a class constructor. ... ok
-
-----------------------------------------------------------------------
-Ran 1 test in 1.396s
-
-OK
-
-And this is an example of using the -p option to run a single file (the filename
-matches the pattern 'ObjC' and it happens to be 'TestObjCMethods.py'):
-
-$ ./dotest.py -v -p ObjC
-----------------------------------------------------------------------
-Collected 4 tests
-
-test_break_with_dsym (TestObjCMethods.FoundationTestCase)
-Test setting objc breakpoints using '_regexp-break' and 'breakpoint set'. ... ok
-test_break_with_dwarf (TestObjCMethods.FoundationTestCase)
-Test setting objc breakpoints using '_regexp-break' and 'breakpoint set'. ... ok
-test_data_type_and_expr_with_dsym (TestObjCMethods.FoundationTestCase)
-Lookup objective-c data types and evaluate expressions. ... ok
-test_data_type_and_expr_with_dwarf (TestObjCMethods.FoundationTestCase)
-Lookup objective-c data types and evaluate expressions. ... ok
-
-----------------------------------------------------------------------
-Ran 4 tests in 16.661s
-
-OK
-
-Running of this script also sets up the LLDB_TEST environment variable so that
-individual test cases can locate their supporting files correctly.  The script
-tries to set up Python's search paths for modules by looking at the build tree
-relative to this script.  See also the '-i' option in the following example.
-
-Finally, this is an example of using the lldb.py module distributed/installed by
-Xcode4 to run against the tests under the 'forward' directory, and with the '-w'
-option to add some delay between two tests.  It uses ARCH=x86_64 to specify that
-as the architecture and CC=clang to specify the compiler used for the test run:
-
-$ PYTHONPATH=/Xcode4/Library/PrivateFrameworks/LLDB.framework/Versions/A/Resources/Python ARCH=x86_64 CC=clang ./dotest.py -v -w -i forward
-
-Session logs for test failures/errors will go into directory '2010-11-11-13_56_16'
-----------------------------------------------------------------------
-Collected 2 tests
-
-test_with_dsym_and_run_command (TestForwardDeclaration.ForwardDeclarationTestCase)
-Display *bar_ptr when stopped on a function with forward declaration of struct bar. ... ok
-test_with_dwarf_and_run_command (TestForwardDeclaration.ForwardDeclarationTestCase)
-Display *bar_ptr when stopped on a function with forward declaration of struct bar. ... ok
-
-----------------------------------------------------------------------
-Ran 2 tests in 5.659s
-
-OK
-
-The 'Session ...' verbiage is recently introduced (see also the '-s' option) to
-notify the directory containing the session logs for test failures or errors.
-In case there is any test failure/error, a similar message is appended at the
-end of the stderr output for your convenience.
-
-ENABLING LOGS FROM TESTS
-
-Option 1:
-
-Writing logs into different files per test case::
-
-This option is particularly useful when multiple dotest instances are created
-by dosep.py
-
-$ ./dotest.py --channel "lldb all"
-
-$ ./dotest.py --channel "lldb all" --channel "gdb-remote packets"
-
-These log files are written to:
-
-<session-dir>/<test-id>-host.log (logs from lldb host process)
-<session-dir>/<test-id>-server.log (logs from debugserver/lldb-server)
-<session-dir>/<test-id>-<test-result>.log (console logs)
-
-By default, logs from successful runs are deleted.  Use the --log-success flag
-to create reference logs for debugging.
-
-$ ./dotest.py --log-success
-
-Option 2: (DEPRECATED)
-
-The following options can only enable logs from the host lldb process.
-Only categories from the "lldb" or "gdb-remote" channels can be enabled
-They also do not automatically enable logs in locally running debug servers.
-Also, logs from all test case are written into each log file
-
-o LLDB_LOG: if defined, specifies the log file pathname for the 'lldb' subsystem
-  with a default option of 'event process' if LLDB_LOG_OPTION is not defined.
-
-o GDB_REMOTE_LOG: if defined, specifies the log file pathname for the
-  'process.gdb-remote' subsystem with a default option of 'packets' if
-  GDB_REMOTE_LOG_OPTION is not defined.
-
-""")
-    sys.exit(0)
-
-
-def setCrashInfoHook_Mac(text):
-    import crashinfo
-    crashinfo.setCrashReporterDescription(text)
-
-# implement this in some suitable way for your platform, and then bind it
-# to setCrashInfoHook
-def setCrashInfoHook_NonMac(text):
-    pass
-
-setCrashInfoHook = None
-
-def deleteCrashInfoDylib(dylib_path):
-    try:
-        # Need to modify this to handle multiple tests running at the same time.  If we move this
-        # to the test's real dir, all should be we run sequentially within a test directory.
-        # os.remove(dylib_path)
-        None
-    finally:
-        pass
-
-def setupCrashInfoHook():
-    global setCrashInfoHook
-    setCrashInfoHook = setCrashInfoHook_NonMac # safe default
-    if platform.system() == "Darwin":
-        import lock
-        test_dir = os.environ['LLDB_TEST']
-        if not test_dir or not os.path.exists(test_dir):
-            return
-        dylib_lock = os.path.join(test_dir,"crashinfo.lock")
-        dylib_src = os.path.join(test_dir,"crashinfo.c")
-        dylib_dst = os.path.join(test_dir,"crashinfo.so")
-        try:
-            compile_lock = lock.Lock(dylib_lock)
-            compile_lock.acquire()
-            if not os.path.isfile(dylib_dst) or os.path.getmtime(dylib_dst) < os.path.getmtime(dylib_src):
-                # we need to compile
-                cmd = "SDKROOT= xcrun clang %s -o %s -framework Python -Xlinker -dylib -iframework /System/Library/Frameworks/ -Xlinker -F /System/Library/Frameworks/" % (dylib_src,dylib_dst)
-                if subprocess.call(cmd,shell=True) != 0 or not os.path.isfile(dylib_dst):
-                    raise Exception('command failed: "{}"'.format(cmd))
-        finally:
-            compile_lock.release()
-            del compile_lock
-
-        setCrashInfoHook = setCrashInfoHook_Mac
-
-    else:
-        pass
-
-def shouldSkipBecauseOfCategories(test_categories):
-    global useCategories, categoriesList, skipCategories
-
-    if useCategories:
-        if len(test_categories) == 0 or len(categoriesList & set(test_categories)) == 0:
-            return True
-
-    for category in skipCategories:
-        if category in test_categories:
-            return True
-
-    return False
-
-def parseOptionsAndInitTestdirs():
-    """Initialize the list of directories containing our unittest scripts.
-
-    '-h/--help as the first option prints out usage info and exit the program.
-    """
-
-    global just_do_benchmarks_test
-    global dont_do_dsym_test
-    global dont_do_dwarf_test
-    global dont_do_dwo_test
-    global blacklist
-    global blacklistConfig
-    global categoriesList
-    global validCategories
-    global useCategories
-    global skipCategories
-    global lldbFrameworkPath
-    global configFile
-    global archs
-    global compilers
-    global count
-    global dumpSysPath
-    global bmExecutable
-    global bmBreakpointSpec
-    global bmIterationCount
-    global failfast
-    global filters
-    global fs4all
-    global ignore
-    global progress_bar
-    global runHooks
-    global skip_build_and_cleanup
-    global skip_long_running_test
-    global noHeaders
-    global parsable
-    global regexp
-    global rdir
-    global sdir_name
-    global svn_silent
-    global verbose
-    global testdirs
-    global lldb_platform_name
-    global lldb_platform_url
-    global lldb_platform_working_dir
-    global setCrashInfoHook
-    global is_inferior_test_runner
-    global multiprocess_test_subdir
-    global num_threads
-    global output_on_success
-    global no_multiprocess_test_runner
-    global test_runner_name
-    global results_filename
-    global results_formatter_name
-    global results_formatter_options
-    global results_port
-
-    do_help = False
-
-    platform_system = platform.system()
-    platform_machine = platform.machine()
-
-    parser = dotest_args.create_parser()
-    args = dotest_args.parse_args(parser, sys.argv[1:])
-
-    if args.unset_env_varnames:
-        for env_var in args.unset_env_varnames:
-            if env_var in os.environ:
-                # From Python Doc: When unsetenv() is supported, deletion of items in os.environ
-                # is automatically translated into a corresponding call to unsetenv().
-                del os.environ[env_var]
-                #os.unsetenv(env_var)
-
-    if args.set_env_vars:
-        for env_var in args.set_env_vars:
-            parts = env_var.split('=', 1)
-            if len(parts) == 1:
-                os.environ[parts[0]] = ""
-            else:
-                os.environ[parts[0]] = parts[1]
-
-    # only print the args if being verbose (and parsable is off)
-    if args.v and not args.q:
-        print(sys.argv)
-
-    if args.h:
-        do_help = True
-
-    if args.compilers:
-        compilers = args.compilers
-    else:
-        # Use a compiler appropriate appropriate for the Apple SDK if one was specified
-        if platform_system == 'Darwin' and args.apple_sdk:
-            compilers = [commands.getoutput('xcrun -sdk "%s" -find clang 2> /dev/null' % (args.apple_sdk))]
-        else:
-            # 'clang' on ubuntu 14.04 is 3.4 so we try clang-3.5 first
-            candidateCompilers = ['clang-3.5', 'clang', 'gcc']
-            for candidate in candidateCompilers:
-                if which(candidate):
-                    compilers = [candidate]
-                    break
-
-    if args.channels:
-        lldbtest_config.channels = args.channels
-
-    if args.log_success:
-        lldbtest_config.log_success = args.log_success
-
-    # Set SDKROOT if we are using an Apple SDK
-    if platform_system == 'Darwin' and args.apple_sdk:
-        os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk "%s" --show-sdk-path 2> /dev/null' % (args.apple_sdk))
-
-    if args.archs:
-        archs = args.archs
-        for arch in archs:
-            if arch.startswith('arm') and platform_system == 'Darwin' and not args.apple_sdk:
-                os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk iphoneos.internal --show-sdk-path 2> /dev/null')
-                if not os.path.exists(os.environ['SDKROOT']):
-                    os.environ['SDKROOT'] = commands.getoutput('xcrun --sdk iphoneos --show-sdk-path 2> /dev/null')
-    else:
-        archs = [platform_machine]
-
-    if args.categoriesList:
-        categoriesList = set(test_categories.validate(args.categoriesList, False))
-        useCategories = True
-    else:
-        categoriesList = []
-
-    if args.skipCategories:
-        skipCategories = test_categories.validate(args.skipCategories, False)
-
-    if args.D:
-        dumpSysPath = True
-
-    if args.E:
-        cflags_extras = args.E
-        os.environ['CFLAGS_EXTRAS'] = cflags_extras
-
-    # argparse makes sure we have correct options
-    if args.N == 'dwarf':
-        dont_do_dwarf_test = True
-    elif args.N == 'dwo':
-        dont_do_dwo_test = True
-    elif args.N == 'dsym':
-        dont_do_dsym_test = True
-
-    if args.a or args.plus_a:
-        print("Options '-a' and '+a' have been deprecated. Please use the test category\n"
-              "functionality (-G pyapi, --skip-category pyapi) instead.")
-        sys.exit(1)
-
-    if args.m or args.plus_m:
-        print("Options '-m' and '+m' have been deprecated. Please use the test category\n"
-              "functionality (-G lldb-mi, --skip-category lldb-mi) instead.")
-        sys.exit(1)
-
-    if args.plus_b:
-        just_do_benchmarks_test = True
-
-    if args.b:
-        if args.b.startswith('-'):
-            usage(parser)
-        blacklistFile = args.b
-        if not os.path.isfile(blacklistFile):
-            print('Blacklist file:', blacklistFile, 'does not exist!')
-            usage(parser)
-        # Now read the blacklist contents and assign it to blacklist.
-        execfile(blacklistFile, globals(), blacklistConfig)
-        blacklist = blacklistConfig.get('blacklist')
-
-    if args.c:
-        if args.c.startswith('-'):
-            usage(parser)
-        configFile = args.c
-        if not os.path.isfile(configFile):
-            print('Config file:', configFile, 'does not exist!')
-            usage(parser)
-
-    if args.d:
-        sys.stdout.write("Suspending the process %d to wait for debugger to attach...\n" % os.getpid())
-        sys.stdout.flush()
-        os.kill(os.getpid(), signal.SIGSTOP)
-
-    if args.e:
-        if args.e.startswith('-'):
-            usage(parser)
-        bmExecutable = args.e
-        if not is_exe(bmExecutable):
-            usage(parser)
-
-    if args.F:
-        failfast = True
-
-    if args.f:
-        if any([x.startswith('-') for x in args.f]):
-            usage(parser)
-        filters.extend(args.f)
-        # Shut off multiprocessing mode when additional filters are specified.
-        # The rational is that the user is probably going after a very specific
-        # test and doesn't need a bunch of parallel test runners all looking for
-        # it in a frenzy.  Also, '-v' now spits out all test run output even
-        # on success, so the standard recipe for redoing a failing test (with -v
-        # and a -f to filter to the specific test) now causes all test scanning
-        # (in parallel) to print results for do-nothing runs in a very distracting
-        # manner.  If we really need filtered parallel runs in the future, consider
-        # adding a --no-output-on-success that prevents -v from setting
-        # output-on-success.
-        no_multiprocess_test_runner = True
-
-    if args.g:
-        fs4all = False
-
-    if args.i:
-        ignore = True
-
-    if args.k:
-        runHooks.extend(args.k)
-
-    if args.l:
-        skip_long_running_test = False
-
-    if args.framework:
-        lldbFrameworkPath = args.framework
-
-    if args.executable:
-        lldbtest_config.lldbExec = args.executable
-
-    if args.libcxx:
-        os.environ["LIBCXX_PATH"] = args.libcxx
-
-    if args.n:
-        noHeaders = True
-
-    if args.p:
-        if args.p.startswith('-'):
-            usage(parser)
-        regexp = args.p
-
-    if args.q:
-        noHeaders = True
-        parsable = True
-
-    if args.P and not args.v:
-        progress_bar = True
-        verbose = 0
-
-    if args.R:
-        if args.R.startswith('-'):
-            usage(parser)
-        rdir = os.path.abspath(args.R)
-        if os.path.exists(rdir):
-            import shutil
-            print('Removing tree:', rdir)
-            shutil.rmtree(rdir)
-
-    if args.r:
-        if args.r.startswith('-'):
-            usage(parser)
-        rdir = os.path.abspath(args.r)
-        if os.path.exists(rdir):
-            print('Relocated directory:', rdir, 'must not exist!')
-            usage(parser)
-
-    if args.S:
-        skip_build_and_cleanup = True
-
-    if args.s:
-        if args.s.startswith('-'):
-            usage(parser)
-        sdir_name = args.s
-
-    if args.t:
-        os.environ['LLDB_COMMAND_TRACE'] = 'YES'
-
-    if args.T:
-        svn_silent = False
-
-    if args.v:
-        verbose = 2
-
-    if args.w:
-        os.environ['LLDB_WAIT_BETWEEN_TEST_CASES'] = 'YES'
-
-    if args.X:
-        if args.X.startswith('-'):
-            usage(parser)
-        excluded.add(args.X)
-
-    if args.x:
-        if args.x.startswith('-'):
-            usage(parser)
-        bmBreakpointSpec = args.x
-
-    # argparse makes sure we have a number
-    if args.y:
-        bmIterationCount = args.y
-
-    # argparse makes sure we have a number
-    if args.sharp:
-        count = args.sharp
-
-    if sys.platform.startswith('win32'):
-        os.environ['LLDB_DISABLE_CRASH_DIALOG'] = str(args.disable_crash_dialog)
-        os.environ['LLDB_LAUNCH_INFERIORS_WITHOUT_CONSOLE'] = str(args.hide_inferior_console)
-
-    if do_help == True:
-        usage(parser)
-
-    if args.no_multiprocess:
-        no_multiprocess_test_runner = True
-
-    if args.inferior:
-        is_inferior_test_runner = True
-
-    # Turn on output_on_sucess if either explicitly added or -v specified.
-    if args.output_on_success or args.v:
-        output_on_success = True
-
-    if args.num_threads:
-        num_threads = args.num_threads
-
-    if args.test_subdir:
-        multiprocess_test_subdir = args.test_subdir
-
-    if args.test_runner_name:
-        test_runner_name = args.test_runner_name
-
-    # Capture test results-related args.
-    if args.results_file:
-        results_filename = args.results_file
-
-    if args.results_port:
-        results_port = args.results_port
-
-    if args.results_file and args.results_port:
-        sys.stderr.write(
-            "only one of --results-file and --results-port should "
-            "be specified\n")
-        usage(args)
-
-    if args.results_formatter:
-        results_formatter_name = args.results_formatter
-    if args.results_formatter_options:
-        results_formatter_options = args.results_formatter_options
-
-    if args.lldb_platform_name:
-        lldb_platform_name = args.lldb_platform_name
-    if args.lldb_platform_url:
-        lldb_platform_url = args.lldb_platform_url
-    if args.lldb_platform_working_dir:
-        lldb_platform_working_dir = args.lldb_platform_working_dir
-
-    if args.event_add_entries and len(args.event_add_entries) > 0:
-        entries = {}
-        # Parse out key=val pairs, separated by comma
-        for keyval in args.event_add_entries.split(","):
-            key_val_entry = keyval.split("=")
-            if len(key_val_entry) == 2:
-                (key, val) = key_val_entry
-                val_parts = val.split(':')
-                if len(val_parts) > 1:
-                    (val, val_type) = val_parts
-                    if val_type == 'int':
-                        val = int(val)
-                entries[key] = val
-        # Tell the event builder to create all events with these
-        # key/val pairs in them.
-        if len(entries) > 0:
-            test_results.EventBuilder.add_entries_to_all_events(entries)
-
-    # Gather all the dirs passed on the command line.
-    if len(args.args) > 0:
-        testdirs = list(map(os.path.abspath, args.args))
-        # Shut off multiprocessing mode when test directories are specified.
-        no_multiprocess_test_runner = True
-
-    # If '-r dir' is specified, the tests should be run under the relocated
-    # directory.  Let's copy the testdirs over.
-    if rdir:
-        from shutil import copytree, ignore_patterns
-
-        tmpdirs = []
-        orig_testdirs = testdirs[:]
-        for srcdir in testdirs:
-            # For example, /Volumes/data/lldb/svn/ToT/test/functionalities/watchpoint/hello_watchpoint
-            # shall be split into ['/Volumes/data/lldb/svn/ToT/', 'functionalities/watchpoint/hello_watchpoint'].
-            # Utilize the relative path to the 'test' directory to make our destination dir path.
-            if ("test" + os.sep) in srcdir:
-                to_split_on = "test" + os.sep
-            else:
-                to_split_on = "test"
-            dstdir = os.path.join(rdir, srcdir.split(to_split_on)[1])
-            dstdir = dstdir.rstrip(os.sep)
-            # Don't copy the *.pyc and .svn stuffs.
-            copytree(srcdir, dstdir, ignore=ignore_patterns('*.pyc', '.svn'))
-            tmpdirs.append(dstdir)
-
-        # This will be our modified testdirs.
-        testdirs = tmpdirs
-
-        # With '-r dir' specified, there's no cleanup of intermediate test files.
-        os.environ["LLDB_DO_CLEANUP"] = 'NO'
-
-        # If the original testdirs is ['test'], the make directory has already been copied
-        # recursively and is contained within the rdir/test dir.  For anything
-        # else, we would need to copy over the make directory and its contents,
-        # so that, os.listdir(rdir) looks like, for example:
-        #
-        #     array_types conditional_break make
-        #
-        # where the make directory contains the Makefile.rules file.
-        if len(testdirs) != 1 or os.path.basename(orig_testdirs[0]) != 'test':
-            scriptdir = os.path.dirname(__file__)
-            # Don't copy the .svn stuffs.
-            copytree(os.path.join(scriptdir, 'make'), os.path.join(rdir, 'make'),
-                     ignore=ignore_patterns('.svn'))
-
-    #print("testdirs:", testdirs)
-
-    # Source the configFile if specified.
-    # The side effect, if any, will be felt from this point on.  An example
-    # config file may be these simple two lines:
-    #
-    # sys.stderr = open("/tmp/lldbtest-stderr", "w")
-    # sys.stdout = open("/tmp/lldbtest-stdout", "w")
-    #
-    # which will reassign the two file objects to sys.stderr and sys.stdout,
-    # respectively.
-    #
-    # See also lldb-trunk/examples/test/usage-config.
-    global config, pre_flight, post_flight, lldbtest_remote_sandbox, lldbtest_remote_shell_template
-    if configFile:
-        # Pass config (a dictionary) as the locals namespace for side-effect.
-        execfile(configFile, globals(), config)
-        #print("config:", config)
-        if "pre_flight" in config:
-            pre_flight = config["pre_flight"]
-            if not six.callable(pre_flight):
-                print("fatal error: pre_flight is not callable, exiting.")
-                sys.exit(1)
-        if "post_flight" in config:
-            post_flight = config["post_flight"]
-            if not six.callable(post_flight):
-                print("fatal error: post_flight is not callable, exiting.")
-                sys.exit(1)
-        if "lldbtest_remote_sandbox" in config:
-            lldbtest_remote_sandbox = config["lldbtest_remote_sandbox"]
-        if "lldbtest_remote_shell_template" in config:
-            lldbtest_remote_shell_template = config["lldbtest_remote_shell_template"]
-        #print("sys.stderr:", sys.stderr)
-        #print("sys.stdout:", sys.stdout)
-
-def getXcodeOutputPaths(lldbRootDirectory):
-    result = []
-
-    # These are for xcode build directories.
-    xcode3_build_dir = ['build']
-    xcode4_build_dir = ['build', 'lldb', 'Build', 'Products']
-
-    configurations = [['Debug'], ['DebugClang'], ['Release'], ['BuildAndIntegration']]
-    xcode_build_dirs = [xcode3_build_dir, xcode4_build_dir]
-    for configuration in configurations:
-        for xcode_build_dir in xcode_build_dirs:
-            outputPath = os.path.join(lldbRootDirectory, *(xcode_build_dir+configuration) )
-            result.append(outputPath)
-
-    return result
-
-
-def createSocketToLocalPort(port):
-    def socket_closer(s):
-        """Close down an opened socket properly."""
-        s.shutdown(socket.SHUT_RDWR)
-        s.close()
-
-    sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    sock.connect(("localhost", port))
-    return (sock, lambda: socket_closer(sock))
-
-
-def setupTestResults():
-    """Sets up test results-related objects based on arg settings."""
-    global results_filename
-    global results_file_object
-    global results_formatter_name
-    global results_formatter_object
-    global results_formatter_options
-    global results_port
-
-    default_formatter_name = None
-    cleanup_func = None
-
-    if results_filename:
-        # Open the results file for writing.
-        if results_filename == 'stdout':
-            results_file_object = sys.stdout
-            cleanup_func = None
-        elif results_filename == 'stderr':
-            results_file_object = sys.stderr
-            cleanup_func = None
-        else:
-            results_file_object = open(results_filename, "w")
-            cleanup_func = results_file_object.close
-        default_formatter_name = "test_results.XunitFormatter"
-    elif results_port:
-        # Connect to the specified localhost port.
-        results_file_object, cleanup_func = createSocketToLocalPort(
-            results_port)
-        default_formatter_name = "test_results.RawPickledFormatter"
-
-    if results_file_object:
-        # We care about the formatter.  Choose user-specified or, if
-        # none specified, use the default for the output type.
-        if results_formatter_name:
-            formatter_name = results_formatter_name
-        else:
-            formatter_name = default_formatter_name
-
-        # Create an instance of the class.  First figure out the package/module.
-        components = formatter_name.split(".")
-        module = importlib.import_module(".".join(components[:-1]))
-
-        # Create the class name we need to load.
-        clazz = getattr(module, components[-1])
-
-        # Handle formatter options for the results formatter class.
-        formatter_arg_parser = clazz.arg_parser()
-        if results_formatter_options and len(results_formatter_options) > 0:
-            command_line_options = results_formatter_options
-        else:
-            command_line_options = []
-
-        formatter_options = formatter_arg_parser.parse_args(
-            command_line_options)
-
-        # Create the TestResultsFormatter given the processed options.
-        results_formatter_object = clazz(results_file_object, formatter_options)
-
-        # Start the results formatter session - we'll only have one
-        # during a given dotest process invocation.
-        initialize_event = EventBuilder.bare_event("initialize")
-        if isMultiprocessTestRunner():
-            if test_runner_name is not None and test_runner_name == "serial":
-                # Only one worker queue here.
-                worker_count = 1
-            else:
-                # Workers will be the number of threads specified.
-                worker_count = num_threads
-        else:
-            worker_count = 1
-        initialize_event["worker_count"] = worker_count
-
-        results_formatter_object.handle_event(initialize_event)
-
-        def shutdown_formatter():
-            # Tell the formatter to write out anything it may have
-            # been saving until the very end (e.g. xUnit results
-            # can't complete its output until this point).
-            results_formatter_object.send_terminate_as_needed()
-
-            # And now close out the output file-like object.
-            if cleanup_func is not None:
-                cleanup_func()
-
-        atexit.register(shutdown_formatter)
-
-
-def getOutputPaths(lldbRootDirectory):
-    """
-    Returns typical build output paths for the lldb executable
-
-    lldbDirectory - path to the root of the lldb svn/git repo
-    """
-    result = []
-
-    if sys.platform == 'darwin':
-        result.extend(getXcodeOutputPaths(lldbRootDirectory))
-
-    # cmake builds?  look for build or build/host folder next to llvm directory
-    # lldb is located in llvm/tools/lldb so we need to go up three levels
-    llvmParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir, os.pardir, os.pardir))
-    result.append(os.path.join(llvmParentDir, 'build', 'bin'))
-    result.append(os.path.join(llvmParentDir, 'build', 'host', 'bin'))
-
-    # some cmake developers keep their build directory beside their lldb directory
-    lldbParentDir = os.path.abspath(os.path.join(lldbRootDirectory, os.pardir))
-    result.append(os.path.join(lldbParentDir, 'build', 'bin'))
-    result.append(os.path.join(lldbParentDir, 'build', 'host', 'bin'))
-
-    return result
-
-def setupSysPath():
-    """
-    Add LLDB.framework/Resources/Python to the search paths for modules.
-    As a side effect, we also discover the 'lldb' executable and export it here.
-    """
-
-    global rdir
-    global testdirs
-    global dumpSysPath
-    global noHeaders
-    global svn_info
-    global svn_silent
-    global lldbFrameworkPath
-
-    # Get the directory containing the current script.
-    if "DOTEST_PROFILE" in os.environ and "DOTEST_SCRIPT_DIR" in os.environ:
-        scriptPath = os.environ["DOTEST_SCRIPT_DIR"]
-    else:
-        scriptPath = os.path.dirname(os.path.realpath(__file__))
-    if not scriptPath.endswith('test'):
-        print("This script expects to reside in lldb's test directory.")
-        sys.exit(-1)
-
-    if rdir:
-        # Set up the LLDB_TEST environment variable appropriately, so that the
-        # individual tests can be located relatively.
-        #
-        # See also lldbtest.TestBase.setUpClass(cls).
-        if len(testdirs) == 1 and os.path.basename(testdirs[0]) == 'test':
-            os.environ["LLDB_TEST"] = os.path.join(rdir, 'test')
-        else:
-            os.environ["LLDB_TEST"] = rdir
-    else:
-        os.environ["LLDB_TEST"] = scriptPath
-
-    # Set up the LLDB_SRC environment variable, so that the tests can locate
-    # the LLDB source code.
-    # When this changes over to a package instead of a standalone script, this
-    # will be `lldbsuite.lldb_root`
-    os.environ["LLDB_SRC"] = os.path.join(scriptPath, os.pardir)
-
-    pluginPath = os.path.join(scriptPath, 'plugins')
-    toolsLLDBMIPath = os.path.join(scriptPath, 'tools', 'lldb-mi')
-    toolsLLDBServerPath = os.path.join(scriptPath, 'tools', 'lldb-server')
-
-    # Insert script dir, plugin dir, lldb-mi dir and lldb-server dir to the sys.path.
-    sys.path.insert(0, scriptPath)
-    sys.path.insert(0, pluginPath)
-    sys.path.insert(0, toolsLLDBMIPath)      # Adding test/tools/lldb-mi to the path makes it easy
-                                             # to "import lldbmi_testcase" from the MI tests
-    sys.path.insert(0, toolsLLDBServerPath)  # Adding test/tools/lldb-server to the path makes it easy
-                                             # to "import lldbgdbserverutils" from the lldb-server tests
-
-    # This is the root of the lldb git/svn checkout
-    # When this changes over to a package instead of a standalone script, this
-    # will be `lldbsuite.lldb_root`
-    lldbRootDirectory = os.path.abspath(os.path.join(scriptPath, os.pardir))
-
-    # Some of the tests can invoke the 'lldb' command directly.
-    # We'll try to locate the appropriate executable right here.
-
-    # The lldb executable can be set from the command line
-    # if it's not set, we try to find it now
-    # first, we try the environment
-    if not lldbtest_config.lldbExec:
-        # First, you can define an environment variable LLDB_EXEC specifying the
-        # full pathname of the lldb executable.
-        if "LLDB_EXEC" in os.environ:
-            lldbtest_config.lldbExec = os.environ["LLDB_EXEC"]
-
-    if not lldbtest_config.lldbExec:
-        outputPaths = getOutputPaths(lldbRootDirectory)
-        for outputPath in outputPaths:
-            candidatePath = os.path.join(outputPath, 'lldb')
-            if is_exe(candidatePath):
-                lldbtest_config.lldbExec = candidatePath
-                break
-
-    if not lldbtest_config.lldbExec:
-        # Last, check the path
-        lldbtest_config.lldbExec = which('lldb')
-
-    if lldbtest_config.lldbExec and not is_exe(lldbtest_config.lldbExec):
-        print("'{}' is not a path to a valid executable".format(lldbtest_config.lldbExec))
-        lldbtest_config.lldbExec = None
-
-    if not lldbtest_config.lldbExec:
-        print("The 'lldb' executable cannot be located.  Some of the tests may not be run as a result.")
-        sys.exit(-1)
-
-    lldbLibDir = os.path.dirname(lldbtest_config.lldbExec)  # confusingly, this is the "bin" directory
-    os.environ["LLDB_LIB_DIR"] = lldbLibDir
-    lldbImpLibDir = os.path.join(lldbLibDir, '..', 'lib') if sys.platform.startswith('win32') else lldbLibDir
-    os.environ["LLDB_IMPLIB_DIR"] = lldbImpLibDir
-    if not noHeaders:
-        print("LLDB library dir:", os.environ["LLDB_LIB_DIR"])
-        print("LLDB import library dir:", os.environ["LLDB_IMPLIB_DIR"])
-        os.system('%s -v' % lldbtest_config.lldbExec)
-
-    # Assume lldb-mi is in same place as lldb
-    # If not found, disable the lldb-mi tests
-    lldbMiExec = None
-    if lldbtest_config.lldbExec and is_exe(lldbtest_config.lldbExec + "-mi"):
-        lldbMiExec = lldbtest_config.lldbExec + "-mi"
-    if not lldbMiExec:
-        if not shouldSkipBecauseOfCategories(["lldb-mi"]):
-            print("The 'lldb-mi' executable cannot be located.  The lldb-mi tests can not be run as a result.")
-            skipCategories.append("lldb-mi")
-    else:
-        os.environ["LLDBMI_EXEC"] = lldbMiExec
-
-    # Skip printing svn/git information when running in parsable (lit-test compatibility) mode
-    if not svn_silent and not parsable:
-        if os.path.isdir(os.path.join(lldbRootDirectory, '.svn')) and which("svn") is not None:
-            pipe = subprocess.Popen([which("svn"), "info", lldbRootDirectory], stdout = subprocess.PIPE)
-            svn_info = pipe.stdout.read()
-        elif os.path.isdir(os.path.join(lldbRootDirectory, '.git')) and which("git") is not None:
-            pipe = subprocess.Popen([which("git"), "svn", "info", lldbRootDirectory], stdout = subprocess.PIPE)
-            svn_info = pipe.stdout.read()
-        if not noHeaders:
-            print(svn_info)
-
-    global ignore
-
-    lldbPythonDir = None # The directory that contains 'lldb/__init__.py'
-    if lldbFrameworkPath:
-        candidatePath = os.path.join(lldbFrameworkPath, 'Resources', 'Python')
-        if os.path.isfile(os.path.join(candidatePath, 'lldb/__init__.py')):
-            lldbPythonDir = candidatePath
-        if not lldbPythonDir:
-            print('Resources/Python/lldb/__init__.py was not found in ' + lldbFrameworkPath)
-            sys.exit(-1)
-    else:
-        # The '-i' option is used to skip looking for lldb.py in the build tree.
-        if ignore:
-            return
-        
-        # If our lldb supports the -P option, use it to find the python path:
-        init_in_python_dir = os.path.join('lldb', '__init__.py')
-
-        lldb_dash_p_result = subprocess.check_output([lldbtest_config.lldbExec, "-P"], stderr=subprocess.STDOUT)
-
-        if lldb_dash_p_result and not lldb_dash_p_result.startswith(("<", "lldb: invalid option:")) \
-							  and not lldb_dash_p_result.startswith("Traceback"):
-            lines = lldb_dash_p_result.splitlines()
-
-            # Workaround for readline vs libedit issue on FreeBSD.  If stdout
-            # is not a terminal Python executes
-            #     rl_variable_bind ("enable-meta-key", "off");
-            # This produces a warning with FreeBSD's libedit because the
-            # enable-meta-key variable is unknown.  Not an issue on Apple
-            # because cpython commit f0ab6f9f0603 added a #ifndef __APPLE__
-            # around the call.  See http://bugs.python.org/issue19884 for more
-            # information.  For now we just discard the warning output.
-            if len(lines) >= 1 and lines[0].startswith("bind: Invalid command"):
-                lines.pop(0)
-
-            # Taking the last line because lldb outputs
-            # 'Cannot read termcap database;\nusing dumb terminal settings.\n'
-            # before the path
-            if len(lines) >= 1 and os.path.isfile(os.path.join(lines[-1], init_in_python_dir)):
-                lldbPythonDir = lines[-1]
-                if "freebsd" in sys.platform or "linux" in sys.platform:
-                    os.environ['LLDB_LIB_DIR'] = os.path.join(lldbPythonDir, '..', '..')
-        
-        if not lldbPythonDir:
-            if platform.system() == "Darwin":
-                python_resource_dir = ['LLDB.framework', 'Resources', 'Python']
-                outputPaths = getXcodeOutputPaths()
-                for outputPath in outputPaths:
-                    candidatePath = os.path.join(outputPath, python_resource_dir)
-                    if os.path.isfile(os.path.join(candidatePath, init_in_python_dir)):
-                        lldbPythonDir = candidatePath
-                        break
-
-                if not lldbPythonDir:
-                    print('This script requires lldb.py to be in either ' + dbgPath + ',', end=' ')
-                    print(relPath + ', or ' + baiPath + '. Some tests might fail.')
-            else:
-                print("Unable to load lldb extension module.  Possible reasons for this include:")
-                print("  1) LLDB was built with LLDB_DISABLE_PYTHON=1")
-                print("  2) PYTHONPATH and PYTHONHOME are not set correctly.  PYTHONHOME should refer to")
-                print("     the version of Python that LLDB built and linked against, and PYTHONPATH")
-                print("     should contain the Lib directory for the same python distro, as well as the")
-                print("     location of LLDB\'s site-packages folder.")
-                print("  3) A different version of Python than that which was built against is exported in")
-                print("     the system\'s PATH environment variable, causing conflicts.")
-                print("  4) The executable '%s' could not be found.  Please check " % lldbExecutable)
-                print("     that it exists and is executable.")
-
-    if lldbPythonDir:
-        lldbPythonDir = os.path.normpath(lldbPythonDir)
-        # Some of the code that uses this path assumes it hasn't resolved the Versions... link.  
-        # If the path we've constructed looks like that, then we'll strip out the Versions/A part.
-        (before, frameWithVersion, after) = lldbPythonDir.rpartition("LLDB.framework/Versions/A")
-        if frameWithVersion != "" :
-            lldbPythonDir = before + "LLDB.framework" + after
-
-        lldbPythonDir = os.path.abspath(lldbPythonDir)
-
-        # If tests need to find LLDB_FRAMEWORK, now they can do it
-        os.environ["LLDB_FRAMEWORK"] = os.path.dirname(os.path.dirname(lldbPythonDir))
-
-        # This is to locate the lldb.py module.  Insert it right after sys.path[0].
-        sys.path[1:1] = [lldbPythonDir]
-        if dumpSysPath:
-            print("sys.path:", sys.path)
-
-def visit(prefix, dir, names):
-    """Visitor function for os.path.walk(path, visit, arg)."""
-
-    global suite
-    global regexp
-    global filters
-    global fs4all
-    global excluded
-    global all_tests
-
-    if set(dir.split(os.sep)).intersection(excluded):
-        #print("Detected an excluded dir component: %s" % dir)
-        return
-
-    for name in names:
-        if os.path.isdir(os.path.join(dir, name)):
-            continue
-
-        if '.py' == os.path.splitext(name)[1] and name.startswith(prefix):
-
-            if name in all_tests:
-                raise Exception("Found multiple tests with the name %s" % name)
-            all_tests.add(name)
-
-            # Try to match the regexp pattern, if specified.
-            if regexp:
-                import re
-                if re.search(regexp, name):
-                    #print("Filename: '%s' matches pattern: '%s'" % (name, regexp))
-                    pass
-                else:
-                    #print("Filename: '%s' does not match pattern: '%s'" % (name, regexp))
-                    continue
-
-            # We found a match for our test.  Add it to the suite.
-
-            # Update the sys.path first.
-            if not sys.path.count(dir):
-                sys.path.insert(0, dir)
-            base = os.path.splitext(name)[0]
-
-            # Thoroughly check the filterspec against the base module and admit
-            # the (base, filterspec) combination only when it makes sense.
-            filterspec = None
-            for filterspec in filters:
-                # Optimistically set the flag to True.
-                filtered = True
-                module = __import__(base)
-                parts = filterspec.split('.')
-                obj = module
-                for part in parts:
-                    try:
-                        parent, obj = obj, getattr(obj, part)
-                    except AttributeError:
-                        # The filterspec has failed.
-                        filtered = False
-                        break
-
-                # If filtered, we have a good filterspec.  Add it.
-                if filtered:
-                    #print("adding filter spec %s to module %s" % (filterspec, module))
-                    suite.addTests(
-                        unittest2.defaultTestLoader.loadTestsFromName(filterspec, module))
-                    continue
-
-            # Forgo this module if the (base, filterspec) combo is invalid
-            # and no '-g' option is specified
-            if filters and fs4all and not filtered:
-                continue
-
-            # Add either the filtered test case(s) (which is done before) or the entire test class.
-            if not filterspec or not filtered:
-                # A simple case of just the module name.  Also the failover case
-                # from the filterspec branch when the (base, filterspec) combo
-                # doesn't make sense.
-                suite.addTests(unittest2.defaultTestLoader.loadTestsFromName(base))
-
-
-def disabledynamics():
-    import lldb
-    ci = lldb.DBG.GetCommandInterpreter()
-    res = lldb.SBCommandReturnObject()
-    ci.HandleCommand("setting set target.prefer-dynamic-value no-dynamic-values", res, False)    
-    if not res.Succeeded():
-        raise Exception('disabling dynamic type support failed')
-
-def lldbLoggings():
-    import lldb
-    """Check and do lldb loggings if necessary."""
-
-    # Turn on logging for debugging purposes if ${LLDB_LOG} environment variable is
-    # defined.  Use ${LLDB_LOG} to specify the log file.
-    ci = lldb.DBG.GetCommandInterpreter()
-    res = lldb.SBCommandReturnObject()
-    if ("LLDB_LOG" in os.environ):
-        open(os.environ["LLDB_LOG"], 'w').close()
-        if ("LLDB_LOG_OPTION" in os.environ):
-            lldb_log_option = os.environ["LLDB_LOG_OPTION"]
-        else:
-            lldb_log_option = "event process expr state api"
-        ci.HandleCommand(
-            "log enable -n -f " + os.environ["LLDB_LOG"] + " lldb " + lldb_log_option,
-            res)
-        if not res.Succeeded():
-            raise Exception('log enable failed (check LLDB_LOG env variable)')
-
-    if ("LLDB_LINUX_LOG" in os.environ):
-        open(os.environ["LLDB_LINUX_LOG"], 'w').close()
-        if ("LLDB_LINUX_LOG_OPTION" in os.environ):
-            lldb_log_option = os.environ["LLDB_LINUX_LOG_OPTION"]
-        else:
-            lldb_log_option = "event process expr state api"
-        ci.HandleCommand(
-            "log enable -n -f " + os.environ["LLDB_LINUX_LOG"] + " linux " + lldb_log_option,
-            res)
-        if not res.Succeeded():
-            raise Exception('log enable failed (check LLDB_LINUX_LOG env variable)')
- 
-    # Ditto for gdb-remote logging if ${GDB_REMOTE_LOG} environment variable is defined.
-    # Use ${GDB_REMOTE_LOG} to specify the log file.
-    if ("GDB_REMOTE_LOG" in os.environ):
-        if ("GDB_REMOTE_LOG_OPTION" in os.environ):
-            gdb_remote_log_option = os.environ["GDB_REMOTE_LOG_OPTION"]
-        else:
-            gdb_remote_log_option = "packets process"
-        ci.HandleCommand(
-            "log enable -n -f " + os.environ["GDB_REMOTE_LOG"] + " gdb-remote "
-            + gdb_remote_log_option,
-            res)
-        if not res.Succeeded():
-            raise Exception('log enable failed (check GDB_REMOTE_LOG env variable)')
-
-def getMyCommandLine():
-    return ' '.join(sys.argv)
-
-# ======================================== #
-#                                          #
-# Execution of the test driver starts here #
-#                                          #
-# ======================================== #
-
-def checkDsymForUUIDIsNotOn():
-    cmd = ["defaults", "read", "com.apple.DebugSymbols"]
-    pipe = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
-    cmd_output = pipe.stdout.read()
-    if cmd_output and "DBGFileMappedPaths = " in cmd_output:
-        print("%s =>" % ' '.join(cmd))
-        print(cmd_output)
-        print("Disable automatic lookup and caching of dSYMs before running the test suite!")
-        print("Exiting...")
-        sys.exit(0)
-
-def exitTestSuite(exitCode = None):
-    import lldb
-    lldb.SBDebugger.Terminate()
-    if exitCode:
-        sys.exit(exitCode)
-
-
-def isMultiprocessTestRunner():
-    # We're not multiprocess when we're either explicitly
-    # the inferior (as specified by the multiprocess test
-    # runner) OR we've been told to skip using the multiprocess
-    # test runner
-    return not (is_inferior_test_runner or no_multiprocess_test_runner)
-
-def run_suite():
-    global just_do_benchmarks_test
-    global dont_do_dsym_test
-    global dont_do_dwarf_test
-    global dont_do_dwo_test
-    global blacklist
-    global blacklistConfig
-    global categoriesList
-    global validCategories
-    global useCategories
-    global skipCategories
-    global lldbFrameworkPath
-    global configFile
-    global archs
-    global compilers
-    global count
-    global dumpSysPath
-    global bmExecutable
-    global bmBreakpointSpec
-    global bmIterationCount
-    global failed
-    global failfast
-    global filters
-    global fs4all
-    global ignore
-    global progress_bar
-    global runHooks
-    global skip_build_and_cleanup
-    global skip_long_running_test
-    global noHeaders
-    global parsable
-    global regexp
-    global rdir
-    global sdir_name
-    global svn_silent
-    global verbose
-    global testdirs
-    global lldb_platform_name
-    global lldb_platform_url
-    global lldb_platform_working_dir
-    global setCrashInfoHook
-    global is_inferior_test_runner
-    global multiprocess_test_subdir
-    global num_threads
-    global output_on_success
-    global no_multiprocess_test_runner
-    global test_runner_name
-    global results_filename
-    global results_formatter_name
-    global results_formatter_options
-    global results_port
-
-    # On MacOS X, check to make sure that domain for com.apple.DebugSymbols defaults
-    # does not exist before proceeding to running the test suite.
-    if sys.platform.startswith("darwin"):
-        checkDsymForUUIDIsNotOn()
-
-    #
-    # Start the actions by first parsing the options while setting up the test
-    # directories, followed by setting up the search paths for lldb utilities;
-    # then, we walk the directory trees and collect the tests into our test suite.
-    #
-    parseOptionsAndInitTestdirs()
-
-    # Setup test results (test results formatter and output handling).
-    setupTestResults()
-
-    # If we are running as the multiprocess test runner, kick off the
-    # multiprocess test runner here.
-    if isMultiprocessTestRunner():
-        import dosep
-        dosep.main(output_on_success, num_threads, multiprocess_test_subdir,
-                   test_runner_name, results_formatter_object)
-        raise Exception("should never get here")
-    elif is_inferior_test_runner:
-        # Shut off Ctrl-C processing in inferiors.  The parallel
-        # test runner handles this more holistically.
-        signal.signal(signal.SIGINT, signal.SIG_IGN)
-
-    setupSysPath()
-    setupCrashInfoHook()
-
-    #
-    # If '-l' is specified, do not skip the long running tests.
-    if not skip_long_running_test:
-        os.environ["LLDB_SKIP_LONG_RUNNING_TEST"] = "NO"
-
-    # For the time being, let's bracket the test runner within the
-    # lldb.SBDebugger.Initialize()/Terminate() pair.
-    import lldb
-
-    # Create a singleton SBDebugger in the lldb namespace.
-    lldb.DBG = lldb.SBDebugger.Create()
-
-    if lldb_platform_name:
-        print("Setting up remote platform '%s'" % (lldb_platform_name))
-        lldb.remote_platform = lldb.SBPlatform(lldb_platform_name)
-        if not lldb.remote_platform.IsValid():
-            print("error: unable to create the LLDB platform named '%s'." % (lldb_platform_name))
-            exitTestSuite(1)
-        if lldb_platform_url:
-            # We must connect to a remote platform if a LLDB platform URL was specified
-            print("Connecting to remote platform '%s' at '%s'..." % (lldb_platform_name, lldb_platform_url))
-            lldb.platform_url = lldb_platform_url
-            platform_connect_options = lldb.SBPlatformConnectOptions(lldb_platform_url)
-            err = lldb.remote_platform.ConnectRemote(platform_connect_options)
-            if err.Success():
-                print("Connected.")
-            else:
-                print("error: failed to connect to remote platform using URL '%s': %s" % (lldb_platform_url, err))
-                exitTestSuite(1)
-        else:
-            lldb.platform_url = None
-
-        if lldb_platform_working_dir:
-            print("Setting remote platform working directory to '%s'..." % (lldb_platform_working_dir))
-            lldb.remote_platform.SetWorkingDirectory(lldb_platform_working_dir)
-    
-        lldb.remote_platform_working_dir = lldb_platform_working_dir
-        lldb.DBG.SetSelectedPlatform(lldb.remote_platform)
-    else:
-        lldb.remote_platform = None
-        lldb.remote_platform_working_dir = None
-        lldb.platform_url = None
-
-    target_platform = lldb.DBG.GetSelectedPlatform().GetTriple().split('-')[2]
-
-    # By default, both dsym, dwarf and dwo tests are performed.
-    # Use @dsym_test, @dwarf_test or @dwo_test decorators, defined in lldbtest.py, to mark a test as
-    # a dsym, dwarf or dwo test.  Use '-N dsym', '-N dwarf' or '-N dwo' to exclude dsym, dwarf or
-    # dwo tests from running.
-    dont_do_dsym_test = dont_do_dsym_test or any(platform in target_platform for platform in ["linux", "freebsd", "windows"])
-    dont_do_dwo_test = dont_do_dwo_test or any(platform in target_platform for platform in ["darwin", "macosx", "ios"])
-
-    # Don't do debugserver tests on everything except OS X.
-    dont_do_debugserver_test = "linux" in target_platform or "freebsd" in target_platform or "windows" in target_platform
-
-    # Don't do lldb-server (llgs) tests on anything except Linux.
-    dont_do_llgs_test = not ("linux" in target_platform)
-
-    #
-    # Walk through the testdirs while collecting tests.
-    #
-    for testdir in testdirs:
-        os.path.walk(testdir, visit, 'Test')
-
-    #
-    # Now that we have loaded all the test cases, run the whole test suite.
-    #
-
-    # Put the blacklist in the lldb namespace, to be used by lldb.TestBase.
-    lldb.blacklist = blacklist
-
-    # The pre_flight and post_flight come from reading a config file.
-    lldb.pre_flight = pre_flight
-    lldb.post_flight = post_flight
-    def getsource_if_available(obj):
-        """
-        Return the text of the source code for an object if available.  Otherwise,
-        a print representation is returned.
-        """
-        import inspect
-        try:
-            return inspect.getsource(obj)
-        except:
-            return repr(obj)
-
-    if not noHeaders:
-        print("lldb.pre_flight:", getsource_if_available(lldb.pre_flight))
-        print("lldb.post_flight:", getsource_if_available(lldb.post_flight))
-
-    # If either pre_flight or post_flight is defined, set lldb.test_remote to True.
-    if lldb.pre_flight or lldb.post_flight:
-        lldb.test_remote = True
-    else:
-        lldb.test_remote = False
-
-    # So do the lldbtest_remote_sandbox and lldbtest_remote_shell_template variables.
-    lldb.lldbtest_remote_sandbox = lldbtest_remote_sandbox
-    lldb.lldbtest_remote_sandboxed_executable = None
-    lldb.lldbtest_remote_shell_template = lldbtest_remote_shell_template
-
-    # Put all these test decorators in the lldb namespace.
-    lldb.just_do_benchmarks_test = just_do_benchmarks_test
-    lldb.dont_do_dsym_test = dont_do_dsym_test
-    lldb.dont_do_dwarf_test = dont_do_dwarf_test
-    lldb.dont_do_dwo_test = dont_do_dwo_test
-    lldb.dont_do_debugserver_test = dont_do_debugserver_test
-    lldb.dont_do_llgs_test = dont_do_llgs_test
-
-    # Do we need to skip build and cleanup?
-    lldb.skip_build_and_cleanup = skip_build_and_cleanup
-
-    # Put bmExecutable, bmBreakpointSpec, and bmIterationCount into the lldb namespace, too.
-    lldb.bmExecutable = bmExecutable
-    lldb.bmBreakpointSpec = bmBreakpointSpec
-    lldb.bmIterationCount = bmIterationCount
-
-    # And don't forget the runHooks!
-    lldb.runHooks = runHooks
-
-    # Turn on lldb loggings if necessary.
-    lldbLoggings()
-
-    # Disable default dynamic types for testing purposes
-    disabledynamics()
-
-    # Install the control-c handler.
-    unittest2.signals.installHandler()
-
-    # If sdir_name is not specified through the '-s sdir_name' option, get a
-    # timestamp string and export it as LLDB_SESSION_DIR environment var.  This will
-    # be used when/if we want to dump the session info of individual test cases
-    # later on.
-    #
-    # See also TestBase.dumpSessionInfo() in lldbtest.py.
-    import datetime
-    # The windows platforms don't like ':' in the pathname.
-    timestamp_started = datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S")
-    if not sdir_name:
-        sdir_name = timestamp_started
-    os.environ["LLDB_SESSION_DIRNAME"] = os.path.join(os.getcwd(), sdir_name)
-
-    if not noHeaders:
-        sys.stderr.write("\nSession logs for test failures/errors/unexpected successes"
-                         " will go into directory '%s'\n" % sdir_name)
-        sys.stderr.write("Command invoked: %s\n" % getMyCommandLine())
-
-    if not os.path.isdir(sdir_name):
-        try:
-            os.mkdir(sdir_name)
-        except OSError as exception:
-            if exception.errno != errno.EEXIST:
-                raise
-    where_to_save_session = os.getcwd()
-    fname = os.path.join(sdir_name, "TestStarted-%d" % os.getpid())
-    with open(fname, "w") as f:
-        print("Test started at: %s\n" % timestamp_started, file=f)
-        print(svn_info, file=f)
-        print("Command invoked: %s\n" % getMyCommandLine(), file=f)
-
-    #
-    # Invoke the default TextTestRunner to run the test suite, possibly iterating
-    # over different configurations.
-    #
-
-    iterArchs = False
-    iterCompilers = False
-
-    if not archs and "archs" in config:
-        archs = config["archs"]
-
-    if isinstance(archs, list) and len(archs) >= 1:
-        iterArchs = True
-
-    if not compilers and "compilers" in config:
-        compilers = config["compilers"]
-
-    #
-    # Add some intervention here to sanity check that the compilers requested are sane.
-    # If found not to be an executable program, the invalid one is dropped from the list.
-    for i in range(len(compilers)):
-        c = compilers[i]
-        if which(c):
-            continue
-        else:
-            if sys.platform.startswith("darwin"):
-                pipe = subprocess.Popen(['xcrun', '-find', c], stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
-                cmd_output = pipe.stdout.read()
-                if cmd_output:
-                    if "not found" in cmd_output:
-                        print("dropping %s from the compilers used" % c)
-                        compilers.remove(i)
-                    else:
-                        compilers[i] = cmd_output.split('\n')[0]
-                        print("'xcrun -find %s' returning %s" % (c, compilers[i]))
-
-    if not parsable:
-        print("compilers=%s" % str(compilers))
-
-    if not compilers or len(compilers) == 0:
-        print("No eligible compiler found, exiting.")
-        exitTestSuite(1)
-
-    if isinstance(compilers, list) and len(compilers) >= 1:
-        iterCompilers = True
-
-    # Make a shallow copy of sys.path, we need to manipulate the search paths later.
-    # This is only necessary if we are relocated and with different configurations.
-    if rdir:
-        old_sys_path = sys.path[:]
-    # If we iterate on archs or compilers, there is a chance we want to split stderr/stdout.
-    if iterArchs or iterCompilers:
-        old_stderr = sys.stderr
-        old_stdout = sys.stdout
-        new_stderr = None
-        new_stdout = None
-
-    # Iterating over all possible architecture and compiler combinations.
-    for ia in range(len(archs) if iterArchs else 1):
-        archConfig = ""
-        if iterArchs:
-            os.environ["ARCH"] = archs[ia]
-            archConfig = "arch=%s" % archs[ia]
-        for ic in range(len(compilers) if iterCompilers else 1):
-            if iterCompilers:
-                os.environ["CC"] = compilers[ic]
-                configString = "%s compiler=%s" % (archConfig, compilers[ic])
-            else:
-                configString = archConfig
-
-            if iterArchs or iterCompilers:
-                # Translate ' ' to '-' for pathname component.
-                from string import maketrans
-                tbl = maketrans(' ', '-')
-                configPostfix = configString.translate(tbl)
-
-                # Check whether we need to split stderr/stdout into configuration
-                # specific files.
-                if old_stderr.name != '<stderr>' and config.get('split_stderr'):
-                    if new_stderr:
-                        new_stderr.close()
-                    new_stderr = open("%s.%s" % (old_stderr.name, configPostfix), "w")
-                    sys.stderr = new_stderr
-                if old_stdout.name != '<stdout>' and config.get('split_stdout'):
-                    if new_stdout:
-                        new_stdout.close()
-                    new_stdout = open("%s.%s" % (old_stdout.name, configPostfix), "w")
-                    sys.stdout = new_stdout
-
-                # If we specified a relocated directory to run the test suite, do
-                # the extra housekeeping to copy the testdirs to a configStringified
-                # directory and to update sys.path before invoking the test runner.
-                # The purpose is to separate the configuration-specific directories
-                # from each other.
-                if rdir:
-                    from shutil import copytree, rmtree, ignore_patterns
-
-                    newrdir = "%s.%s" % (rdir, configPostfix)
-
-                    # Copy the tree to a new directory with postfix name configPostfix.
-                    if os.path.exists(newrdir):
-                        rmtree(newrdir)
-                    copytree(rdir, newrdir, ignore=ignore_patterns('*.pyc', '*.o', '*.d'))
-
-                    # Update the LLDB_TEST environment variable to reflect new top
-                    # level test directory.
-                    #
-                    # See also lldbtest.TestBase.setUpClass(cls).
-                    if len(testdirs) == 1 and os.path.basename(testdirs[0]) == 'test':
-                        os.environ["LLDB_TEST"] = os.path.join(newrdir, 'test')
-                    else:
-                        os.environ["LLDB_TEST"] = newrdir
-
-                    # And update the Python search paths for modules.
-                    sys.path = [x.replace(rdir, newrdir, 1) for x in old_sys_path]
-
-                # Output the configuration.
-                if not parsable:
-                    sys.stderr.write("\nConfiguration: " + configString + "\n")
-
-            #print("sys.stderr name is", sys.stderr.name)
-            #print("sys.stdout name is", sys.stdout.name)
-
-            # First, write out the number of collected test cases.
-            if not parsable:
-                sys.stderr.write(separator + "\n")
-                sys.stderr.write("Collected %d test%s\n\n"
-                                 % (suite.countTestCases(),
-                                    suite.countTestCases() != 1 and "s" or ""))
-
-            class LLDBTestResult(unittest2.TextTestResult):
-                """
-                Enforce a singleton pattern to allow introspection of test progress.
-
-                Overwrite addError(), addFailure(), and addExpectedFailure() methods
-                to enable each test instance to track its failure/error status.  It
-                is used in the LLDB test framework to emit detailed trace messages
-                to a log file for easier human inspection of test failures/errors.
-                """
-                __singleton__ = None
-                __ignore_singleton__ = False
-
-                @staticmethod
-                def getTerminalSize():
-                    import os
-                    env = os.environ
-                    def ioctl_GWINSZ(fd):
-                        try:
-                            import fcntl, termios, struct, os
-                            cr = struct.unpack('hh', fcntl.ioctl(fd, termios.TIOCGWINSZ,
-                        '1234'))
-                        except:
-                            return
-                        return cr
-                    cr = ioctl_GWINSZ(0) or ioctl_GWINSZ(1) or ioctl_GWINSZ(2)
-                    if not cr:
-                        try:
-                            fd = os.open(os.ctermid(), os.O_RDONLY)
-                            cr = ioctl_GWINSZ(fd)
-                            os.close(fd)
-                        except:
-                            pass
-                    if not cr:
-                        cr = (env.get('LINES', 25), env.get('COLUMNS', 80))
-                    return int(cr[1]), int(cr[0])
-
-                def __init__(self, *args):
-                    if not LLDBTestResult.__ignore_singleton__ and LLDBTestResult.__singleton__:
-                        raise Exception("LLDBTestResult instantiated more than once")
-                    super(LLDBTestResult, self).__init__(*args)
-                    LLDBTestResult.__singleton__ = self
-                    # Now put this singleton into the lldb module namespace.
-                    lldb.test_result = self
-                    # Computes the format string for displaying the counter.
-                    global suite
-                    counterWidth = len(str(suite.countTestCases()))
-                    self.fmt = "%" + str(counterWidth) + "d: "
-                    self.indentation = ' ' * (counterWidth + 2)
-                    # This counts from 1 .. suite.countTestCases().
-                    self.counter = 0
-                    (width, height) = LLDBTestResult.getTerminalSize()
-                    self.progressbar = None
-                    global progress_bar
-                    if width > 10 and not parsable and progress_bar:
-                        try:
-                            self.progressbar = progress.ProgressWithEvents(stdout=self.stream,start=0,end=suite.countTestCases(),width=width-10)
-                        except:
-                            self.progressbar = None
-                    self.results_formatter = results_formatter_object
-
-                def _config_string(self, test):
-                  compiler = getattr(test, "getCompiler", None)
-                  arch = getattr(test, "getArchitecture", None)
-                  return "%s-%s" % (compiler() if compiler else "", arch() if arch else "")
-
-                def _exc_info_to_string(self, err, test):
-                    """Overrides superclass TestResult's method in order to append
-                    our test config info string to the exception info string."""
-                    if hasattr(test, "getArchitecture") and hasattr(test, "getCompiler"):
-                        return '%sConfig=%s-%s' % (super(LLDBTestResult, self)._exc_info_to_string(err, test),
-                                                                  test.getArchitecture(),
-                                                                  test.getCompiler())
-                    else:
-                        return super(LLDBTestResult, self)._exc_info_to_string(err, test)
-
-                def getDescription(self, test):
-                    doc_first_line = test.shortDescription()
-                    if self.descriptions and doc_first_line:
-                        return '\n'.join((str(test), self.indentation + doc_first_line))
-                    else:
-                        return str(test)
-
-                def getCategoriesForTest(self,test):
-                    if hasattr(test,"_testMethodName"):
-                        test_method = getattr(test,"_testMethodName")
-                        test_method = getattr(test,test_method)
-                    else:
-                        test_method = None
-                    if test_method != None and hasattr(test_method,"getCategories"):
-                        test_categories = test_method.getCategories(test)
-                    elif hasattr(test,"getCategories"):
-                        test_categories = test.getCategories()
-                    elif inspect.ismethod(test) and test.__self__ != None and hasattr(test.__self__,"getCategories"):
-                        test_categories = test.__self__.getCategories()
-                    else:
-                        test_categories = []
-                    if test_categories == None:
-                        test_categories = []
-                    return test_categories
-
-                def hardMarkAsSkipped(self,test):
-                    getattr(test, test._testMethodName).__func__.__unittest_skip__ = True
-                    getattr(test, test._testMethodName).__func__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
-                    test.__class__.__unittest_skip__ = True
-                    test.__class__.__unittest_skip_why__ = "test case does not fall in any category of interest for this run"
-
-                def startTest(self, test):
-                    if shouldSkipBecauseOfCategories(self.getCategoriesForTest(test)):
-                        self.hardMarkAsSkipped(test)
-                    global setCrashInfoHook
-                    setCrashInfoHook("%s at %s" % (str(test),inspect.getfile(test.__class__)))
-                    self.counter += 1
-                    #if self.counter == 4:
-                    #    import crashinfo
-                    #    crashinfo.testCrashReporterDescription(None)
-                    test.test_number = self.counter
-                    if self.showAll:
-                        self.stream.write(self.fmt % self.counter)
-                    super(LLDBTestResult, self).startTest(test)
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_start(test))
-
-                def addSuccess(self, test):
-                    global parsable
-                    super(LLDBTestResult, self).addSuccess(test)
-                    if parsable:
-                        self.stream.write("PASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_success(test))
-
-                def addError(self, test, err):
-                    global sdir_has_content
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addError(test, err)
-                    method = getattr(test, "markError", None)
-                    if method:
-                        method()
-                    if parsable:
-                        self.stream.write("FAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_error(test, err))
-
-                def addCleanupError(self, test, err):
-                    global sdir_has_content
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addCleanupError(test, err)
-                    method = getattr(test, "markCleanupError", None)
-                    if method:
-                        method()
-                    if parsable:
-                        self.stream.write("CLEANUP ERROR: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_cleanup_error(
-                                test, err))
-
-                def addFailure(self, test, err):
-                    global sdir_has_content
-                    global failuresPerCategory
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addFailure(test, err)
-                    method = getattr(test, "markFailure", None)
-                    if method:
-                        method()
-                    if parsable:
-                        self.stream.write("FAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if useCategories:
-                        test_categories = self.getCategoriesForTest(test)
-                        for category in test_categories:
-                            if category in failuresPerCategory:
-                                failuresPerCategory[category] = failuresPerCategory[category] + 1
-                            else:
-                                failuresPerCategory[category] = 1
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_failure(test, err))
-
-
-                def addExpectedFailure(self, test, err, bugnumber):
-                    global sdir_has_content
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addExpectedFailure(test, err, bugnumber)
-                    method = getattr(test, "markExpectedFailure", None)
-                    if method:
-                        method(err, bugnumber)
-                    if parsable:
-                        self.stream.write("XFAIL: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_expected_failure(
-                            test, err, bugnumber))
-
-                def addSkip(self, test, reason):
-                    global sdir_has_content
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addSkip(test, reason)
-                    method = getattr(test, "markSkippedTest", None)
-                    if method:
-                        method()
-                    if parsable:
-                        self.stream.write("UNSUPPORTED: LLDB (%s) :: %s (%s) \n" % (self._config_string(test), str(test), reason))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_skip(test, reason))
-
-                def addUnexpectedSuccess(self, test, bugnumber):
-                    global sdir_has_content
-                    global parsable
-                    sdir_has_content = True
-                    super(LLDBTestResult, self).addUnexpectedSuccess(test, bugnumber)
-                    method = getattr(test, "markUnexpectedSuccess", None)
-                    if method:
-                        method(bugnumber)
-                    if parsable:
-                        self.stream.write("XPASS: LLDB (%s) :: %s\n" % (self._config_string(test), str(test)))
-                    if self.results_formatter:
-                        self.results_formatter.handle_event(
-                            EventBuilder.event_for_unexpected_success(
-                                test, bugnumber))
-
-
-            if parsable:
-                v = 0
-            elif progress_bar:
-                v = 1
-            else:
-                v = verbose
-
-            # Invoke the test runner.
-            if count == 1:
-                result = unittest2.TextTestRunner(stream=sys.stderr,
-                                                  verbosity=v,
-                                                  failfast=failfast,
-                                                  resultclass=LLDBTestResult).run(suite)
-            else:
-                # We are invoking the same test suite more than once.  In this case,
-                # mark __ignore_singleton__ flag as True so the signleton pattern is
-                # not enforced.
-                LLDBTestResult.__ignore_singleton__ = True
-                for i in range(count):
-               
-                    result = unittest2.TextTestRunner(stream=sys.stderr,
-                                                      verbosity=v,
-                                                      failfast=failfast,
-                                                      resultclass=LLDBTestResult).run(suite)
-
-            failed = failed or not result.wasSuccessful()
-
-    if sdir_has_content and not parsable:
-        sys.stderr.write("Session logs for test failures/errors/unexpected successes"
-                         " can be found in directory '%s'\n" % sdir_name)
-
-    if useCategories and len(failuresPerCategory) > 0:
-        sys.stderr.write("Failures per category:\n")
-        for category in failuresPerCategory:
-            sys.stderr.write("%s - %d\n" % (category,failuresPerCategory[category]))
-
-    os.chdir(where_to_save_session)
-    fname = os.path.join(sdir_name, "TestFinished-%d" % os.getpid())
-    with open(fname, "w") as f:
-        print("Test finished at: %s\n" % datetime.datetime.now().strftime("%Y-%m-%d-%H_%M_%S"), file=f)
-
-    # Terminate the test suite if ${LLDB_TESTSUITE_FORCE_FINISH} is defined.
-    # This should not be necessary now.
-    if ("LLDB_TESTSUITE_FORCE_FINISH" in os.environ):
-        print("Terminating Test suite...")
-        subprocess.Popen(["/bin/sh", "-c", "kill %s; exit 0" % (os.getpid())])
-
-    # Exiting.
-    exitTestSuite(failed)
-
-if __name__ == "__main__":
-    run_suite()
\ No newline at end of file
+import lldbsuite.test
+lldbsuite.test.run_suite()