[Lldb-commits] [lldb] c15c296 - [lldb/test] Reduce boilerplate in lldb-server tests

Pavel Labath via lldb-commits lldb-commits at lists.llvm.org
Fri Dec 18 04:17:15 PST 2020


Author: Pavel Labath
Date: 2020-12-18T13:01:42+01:00
New Revision: c15c29652118292c389d5f9fde1b11b55c248cd9

URL: https://github.com/llvm/llvm-project/commit/c15c29652118292c389d5f9fde1b11b55c248cd9
DIFF: https://github.com/llvm/llvm-project/commit/c15c29652118292c389d5f9fde1b11b55c248cd9.diff

LOG: [lldb/test] Reduce boilerplate in lldb-server tests

Nearly all of our lldb-server tests have two flavours (lldb-server and
debugserver). Each of them is tagged with an appropriate decorator, and
each of them starts with a call to a matching "init" method. The init
calls are mandatory, and it's not possible to meaningfully combine them
with a different decorator.

This patch leverages the existing decorators to also tag the tests with
the appropriate debug server tag, similar to how we do with debug info
flavours. This allows us to make the "init" calls from inside the common
setUp method.

Added: 
    

Modified: 
    lldb/packages/Python/lldbsuite/test/decorators.py
    lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
    lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
    lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
    lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
    lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
    lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
    lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py
    lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
    lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
    lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
    lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
    lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
    lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
    lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
    lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py
    lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
    lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
    lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
    lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py

Removed: 
    


################################################################################
diff  --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index ff445fa0b926..a17cd6ea33ab 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -373,11 +373,13 @@ def should_skip_simulator_test():
 
 def debugserver_test(func):
     """Decorate the item as a debugserver test."""
+    func.debug_server = "debugserver"
     return add_test_categories(["debugserver"])(func)
 
 
 def llgs_test(func):
     """Decorate the item as a lldb-server test."""
+    func.debug_server = "llgs"
     return add_test_categories(["llgs"])(func)
 
 

diff  --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
index b578aae12062..03cf2d4ab981 100644
--- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
+++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py
@@ -80,6 +80,10 @@ def isVerboseLoggingRequested(self):
         return any(("gdb-remote" in channel)
                    for channel in lldbtest_config.channels)
 
+    def getDebugServer(self):
+        method = getattr(self, self.testMethodName)
+        return getattr(method, "debug_server", None)
+
     def setUp(self):
         super(GdbRemoteTestCaseBase, self).setUp()
 
@@ -114,6 +118,12 @@ def setUp(self):
         else:
             self.stub_hostname = "localhost"
 
+        debug_server = self.getDebugServer()
+        if debug_server == "debugserver":
+            self._init_debugserver_test()
+        else:
+            self._init_llgs_test()
+
     def tearDown(self):
         self.logger.removeHandler(self._verbose_log_handler)
         self._verbose_log_handler = None
@@ -150,7 +160,7 @@ def reset_test_sequence(self):
         self.test_sequence = GdbRemoteTestSequence(self.logger)
 
 
-    def init_llgs_test(self):
+    def _init_llgs_test(self):
         reverse_connect = True
         if lldb.remote_platform:
             # Reverse connections may be tricky due to firewalls/NATs.
@@ -198,7 +208,7 @@ def init_llgs_test(self):
 
         self.reverse_connect = reverse_connect
 
-    def init_debugserver_test(self):
+    def _init_debugserver_test(self):
         self.debug_monitor_exe = get_debugserver_exe()
         if not self.debug_monitor_exe:
             self.skipTest("debugserver exe not found")

diff  --git a/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py b/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
index fe4e124cd605..5afb57f3ac46 100644
--- a/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
+++ b/lldb/test/API/commands/target/auto-install-main-executable/TestAutoInstallMainExecutable.py
@@ -19,7 +19,6 @@ class TestAutoInstallMainExecutable(gdbremote_testcase.GdbRemoteTestCaseBase):
     @expectedFailureAll(hostoslist=["windows"], triple='.*-android')
     def test_target_auto_install_main_executable(self):
         self.build()
-        self.init_llgs_test()
 
         # Manually install the modified binary.
         working_dir = lldb.remote_platform.GetWorkingDirectory()

diff  --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
index 2db6e334752d..67ff19f49448 100644
--- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
+++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py
@@ -75,7 +75,6 @@ def check_simulator_ostype(self, sdk, platform, arch='x86_64'):
         self.assertIsNotNone(pid)
 
         # Launch debug monitor attaching to the simulated process
-        self.init_debugserver_test()
         server = self.connect_to_debug_monitor(attach_pid=pid)
 
         # Setup packet sequences

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
index c81944f547b2..84d44b5e0b84 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAttach.py
@@ -53,14 +53,12 @@ def attach_with_vAttach(self):
 
     @debugserver_test
     def test_attach_with_vAttach_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach_manually()
         self.attach_with_vAttach()
 
     @llgs_test
     def test_attach_with_vAttach_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach_manually()
         self.attach_with_vAttach()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
index b89448fd5ba6..f9c8fadc15b9 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteAuxvSupport.py
@@ -104,7 +104,6 @@ def supports_auxv(self):
     @skipIfWindows # no auxv support.
     @llgs_test
     def test_supports_auxv_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.supports_auxv()
@@ -120,7 +119,6 @@ def auxv_data_is_correct_size(self):
 
     @debugserver_test
     def test_auxv_data_is_correct_size_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_data_is_correct_size()
@@ -129,7 +127,6 @@ def test_auxv_data_is_correct_size_debugserver(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_auxv_data_is_correct_size_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_data_is_correct_size()
@@ -160,7 +157,6 @@ def auxv_keys_look_valid(self):
 
     @debugserver_test
     def test_auxv_keys_look_valid_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_keys_look_valid()
@@ -169,7 +165,6 @@ def test_auxv_keys_look_valid_debugserver(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_auxv_keys_look_valid_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_keys_look_valid()
@@ -209,7 +204,6 @@ def auxv_chunked_reads_work(self):
 
     @debugserver_test
     def test_auxv_chunked_reads_work_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_chunked_reads_work()
@@ -218,7 +212,6 @@ def test_auxv_chunked_reads_work_debugserver(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_auxv_chunked_reads_work_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.auxv_chunked_reads_work()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
index 90a131e64531..96ebbfb09bdc 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteExitCode.py
@@ -24,13 +24,11 @@ def inferior_exit_0(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_inferior_exit_0_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.inferior_exit_0()
 
     @llgs_test
     def test_inferior_exit_0_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.inferior_exit_0()
 
@@ -50,12 +48,10 @@ def inferior_exit_42(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_inferior_exit_42_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.inferior_exit_42()
 
     @llgs_test
     def test_inferior_exit_42_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.inferior_exit_42()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
index a6bca741c6ba..a07e227b1a44 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteExpeditedRegisters.py
@@ -86,14 +86,12 @@ def stop_notification_contains_any_registers(self):
 
     @debugserver_test
     def test_stop_notification_contains_any_registers_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_any_registers()
 
     @llgs_test
     def test_stop_notification_contains_any_registers_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_any_registers()
@@ -112,14 +110,12 @@ def stop_notification_contains_no_duplicate_registers(self):
     @debugserver_test
     def test_stop_notification_contains_no_duplicate_registers_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_no_duplicate_registers()
 
     @llgs_test
     def test_stop_notification_contains_no_duplicate_registers_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_no_duplicate_registers()
@@ -129,14 +125,12 @@ def stop_notification_contains_pc_register(self):
 
     @debugserver_test
     def test_stop_notification_contains_pc_register_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_pc_register()
 
     @llgs_test
     def test_stop_notification_contains_pc_register_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_pc_register()
@@ -148,14 +142,12 @@ def stop_notification_contains_fp_register(self):
 
     @debugserver_test
     def test_stop_notification_contains_fp_register_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_fp_register()
 
     @llgs_test
     def test_stop_notification_contains_fp_register_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_fp_register()
@@ -165,14 +157,12 @@ def stop_notification_contains_sp_register(self):
 
     @debugserver_test
     def test_stop_notification_contains_sp_register_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_sp_register()
 
     @llgs_test
     def test_stop_notification_contains_sp_register_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_sp_register()
@@ -183,7 +173,6 @@ def test_stop_notification_contains_sp_register_llgs(self):
     def test_stop_notification_contains_vg_register_llgs(self):
         if not self.isAArch64SVE():
             self.skipTest('SVE registers must be supported.')
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_notification_contains_aarch64_vg_register()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
index 832096a0ff5a..abb1a003d125 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteHostInfo.py
@@ -102,14 +102,12 @@ def validate_darwin_minimum_host_info_keys(self, host_info_dict):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_qHostInfo_returns_at_least_one_key_val_pair_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.get_qHostInfo_response()
 
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @llgs_test
     def test_qHostInfo_returns_at_least_one_key_val_pair_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.get_qHostInfo_response()
 
@@ -117,7 +115,6 @@ def test_qHostInfo_returns_at_least_one_key_val_pair_llgs(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_qHostInfo_contains_darwin_required_keys_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         host_info_dict = self.get_qHostInfo_response()
         self.validate_darwin_minimum_host_info_keys(host_info_dict)
@@ -126,7 +123,6 @@ def test_qHostInfo_contains_darwin_required_keys_debugserver(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @llgs_test
     def test_qHostInfo_contains_darwin_required_keys_llgs(self):
-        self.init_llgs_test()
         self.build()
         host_info_dict = self.get_qHostInfo_response()
         self.validate_darwin_minimum_host_info_keys(host_info_dict)

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
index 038ef1a21e0b..175ecfed538b 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteKill.py
@@ -46,14 +46,12 @@ def attach_commandline_kill_after_initial_stop(self):
 
     @debugserver_test
     def test_attach_commandline_kill_after_initial_stop_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_kill_after_initial_stop()
 
     @llgs_test
     def test_attach_commandline_kill_after_initial_stop_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_kill_after_initial_stop()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
index 5e94dbcf9227..8365b657f932 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteModuleInfo.py
@@ -37,7 +37,6 @@ def module_info(self):
 
     @llgs_test
     def test_module_info(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.module_info()

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
index 3bfe212cc351..a4708679e0d8 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteProcessInfo.py
@@ -36,13 +36,11 @@ def qProcessInfo_returns_running_process(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qProcessInfo_returns_running_process_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.qProcessInfo_returns_running_process()
 
     @llgs_test
     def test_qProcessInfo_returns_running_process_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qProcessInfo_returns_running_process()
 
@@ -69,14 +67,12 @@ def attach_commandline_qProcessInfo_reports_correct_pid(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_attach_commandline_qProcessInfo_reports_correct_pid_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_qProcessInfo_reports_correct_pid()
 
     @llgs_test
     def test_attach_commandline_qProcessInfo_reports_correct_pid_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_qProcessInfo_reports_correct_pid()
@@ -101,13 +97,11 @@ def qProcessInfo_reports_valid_endian(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qProcessInfo_reports_valid_endian_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.qProcessInfo_reports_valid_endian()
 
     @llgs_test
     def test_qProcessInfo_reports_valid_endian_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qProcessInfo_reports_valid_endian()
 
@@ -162,20 +156,17 @@ def qProcessInfo_does_not_contain_keys(self, absent_key_set):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qProcessInfo_contains_cputype_cpusubtype_debugserver_darwin(self):
-        self.init_debugserver_test()
         self.build()
         self.qProcessInfo_contains_keys(set(['cputype', 'cpusubtype']))
 
     @skipUnlessDarwin
     @llgs_test
     def test_qProcessInfo_contains_cputype_cpusubtype_llgs_darwin(self):
-        self.init_llgs_test()
         self.build()
         self.qProcessInfo_contains_keys(set(['cputype', 'cpusubtype']))
 
     @llgs_test
     def test_qProcessInfo_contains_triple_ppid_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qProcessInfo_contains_keys(set(['triple', 'parent-pid']))
 
@@ -183,7 +174,6 @@ def test_qProcessInfo_contains_triple_ppid_llgs(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qProcessInfo_does_not_contain_triple_debugserver_darwin(self):
-        self.init_debugserver_test()
         self.build()
         # We don't expect to see triple on darwin.  If we do, we'll prefer triple
         # to cputype/cpusubtype and skip some darwin-based ProcessGDBRemote ArchSpec setup
@@ -193,7 +183,6 @@ def test_qProcessInfo_does_not_contain_triple_debugserver_darwin(self):
     @skipUnlessDarwin
     @llgs_test
     def test_qProcessInfo_does_not_contain_triple_llgs_darwin(self):
-        self.init_llgs_test()
         self.build()
         # We don't expect to see triple on darwin.  If we do, we'll prefer triple
         # to cputype/cpusubtype and skip some darwin-based ProcessGDBRemote ArchSpec setup
@@ -203,6 +192,5 @@ def test_qProcessInfo_does_not_contain_triple_llgs_darwin(self):
     @skipIfDarwin
     @llgs_test
     def test_qProcessInfo_does_not_contain_cputype_cpusubtype_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qProcessInfo_does_not_contain_keys(set(['cputype', 'cpusubtype']))

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
index e20948ba38af..3d07e19d2d38 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteRegisterState.py
@@ -95,7 +95,6 @@ def grp_register_save_restore_works(self, with_suffix):
     @debugserver_test
     def test_grp_register_save_restore_works_with_suffix_debugserver(self):
         USE_THREAD_SUFFIX = True
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.grp_register_save_restore_works(USE_THREAD_SUFFIX)
@@ -103,7 +102,6 @@ def test_grp_register_save_restore_works_with_suffix_debugserver(self):
     @llgs_test
     def test_grp_register_save_restore_works_with_suffix_llgs(self):
         USE_THREAD_SUFFIX = True
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.grp_register_save_restore_works(USE_THREAD_SUFFIX)
@@ -111,7 +109,6 @@ def test_grp_register_save_restore_works_with_suffix_llgs(self):
     @debugserver_test
     def test_grp_register_save_restore_works_no_suffix_debugserver(self):
         USE_THREAD_SUFFIX = False
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.grp_register_save_restore_works(USE_THREAD_SUFFIX)
@@ -119,7 +116,6 @@ def test_grp_register_save_restore_works_no_suffix_debugserver(self):
     @llgs_test
     def test_grp_register_save_restore_works_no_suffix_llgs(self):
         USE_THREAD_SUFFIX = False
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.grp_register_save_restore_works(USE_THREAD_SUFFIX)

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
index 84c241979083..fba8bec8ee6b 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteSingleStep.py
@@ -13,7 +13,6 @@ class TestGdbRemoteSingleStep(gdbremote_testcase.GdbRemoteTestCaseBase):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_single_step_only_steps_one_instruction_with_s_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(
@@ -23,7 +22,6 @@ def test_single_step_only_steps_one_instruction_with_s_debugserver(self):
     @llgs_test
     @skipIf(triple='^mips')
     def test_single_step_only_steps_one_instruction_with_s_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index 891a0101614a..c83b4fbdd37d 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -177,14 +177,12 @@ def QListThreadsInStopReply_supported(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_QListThreadsInStopReply_supported_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.QListThreadsInStopReply_supported()
 
     @llgs_test
     def test_QListThreadsInStopReply_supported_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.QListThreadsInStopReply_supported()
@@ -199,7 +197,6 @@ def stop_reply_reports_multiple_threads(self, thread_count):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_stop_reply_reports_multiple_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_reports_multiple_threads(5)
@@ -212,7 +209,6 @@ def test_stop_reply_reports_multiple_threads_debugserver(self):
     @skipIfNetBSD
     @llgs_test
     def test_stop_reply_reports_multiple_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_reports_multiple_threads(5)
@@ -226,7 +222,6 @@ def no_QListThreadsInStopReply_supplies_no_threads(self, thread_count):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_no_QListThreadsInStopReply_supplies_no_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.no_QListThreadsInStopReply_supplies_no_threads(5)
@@ -235,7 +230,6 @@ def test_no_QListThreadsInStopReply_supplies_no_threads_debugserver(self):
     @skipIfNetBSD
     @llgs_test
     def test_no_QListThreadsInStopReply_supplies_no_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.no_QListThreadsInStopReply_supplies_no_threads(5)
@@ -265,7 +259,6 @@ def stop_reply_reports_correct_threads(self, thread_count):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_stop_reply_reports_correct_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_reports_correct_threads(5)
@@ -274,7 +267,6 @@ def test_stop_reply_reports_correct_threads_debugserver(self):
     @skipIfNetBSD
     @llgs_test
     def test_stop_reply_reports_correct_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_reports_correct_threads(5)
@@ -300,7 +292,6 @@ def stop_reply_contains_thread_pcs(self, thread_count):
     @skipIfNetBSD
     @llgs_test
     def test_stop_reply_contains_thread_pcs_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_contains_thread_pcs(5)
@@ -308,7 +299,6 @@ def test_stop_reply_contains_thread_pcs_llgs(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @debugserver_test
     def test_stop_reply_contains_thread_pcs_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.stop_reply_contains_thread_pcs(5)

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 076b0dadd528..f8ecf5509b56 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -117,7 +117,6 @@ def qThreadStopInfo_works_for_multiple_threads(self, thread_count):
 
     @debugserver_test
     def test_qThreadStopInfo_works_for_multiple_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_works_for_multiple_threads(self.THREAD_COUNT)
@@ -125,7 +124,6 @@ def test_qThreadStopInfo_works_for_multiple_threads_debugserver(self):
     @llgs_test
     @skipIfNetBSD
     def test_qThreadStopInfo_works_for_multiple_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_works_for_multiple_threads(self.THREAD_COUNT)
@@ -157,7 +155,6 @@ def qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt(
     @debugserver_test
     def test_qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt(
@@ -168,7 +165,6 @@ def test_qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt_de
     @llgs_test
     def test_qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_only_reports_one_thread_stop_reason_during_interrupt(
@@ -187,7 +183,6 @@ def qThreadStopInfo_has_valid_thread_names(
     @unittest2.skip("MacOSX doesn't have a default thread name")
     @debugserver_test
     def test_qThreadStopInfo_has_valid_thread_names_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_has_valid_thread_names(self.THREAD_COUNT, "a.out")
@@ -197,7 +192,6 @@ def test_qThreadStopInfo_has_valid_thread_names_debugserver(self):
     @skipUnlessPlatform(["linux", "windows"])
     @llgs_test
     def test_qThreadStopInfo_has_valid_thread_names_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadStopInfo_has_valid_thread_names(self.THREAD_COUNT, "a.out")

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
index 758b0bc72fc6..e622932e19e0 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemote_vCont.py
@@ -41,56 +41,48 @@ def vCont_supports_S(self):
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @debugserver_test
     def test_vCont_supports_c_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.vCont_supports_c()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @llgs_test
     def test_vCont_supports_c_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.vCont_supports_c()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @debugserver_test
     def test_vCont_supports_C_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.vCont_supports_C()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @llgs_test
     def test_vCont_supports_C_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.vCont_supports_C()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @debugserver_test
     def test_vCont_supports_s_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.vCont_supports_s()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @llgs_test
     def test_vCont_supports_s_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.vCont_supports_s()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @debugserver_test
     def test_vCont_supports_S_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.vCont_supports_S()
 
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     @llgs_test
     def test_vCont_supports_S_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.vCont_supports_S()
 
@@ -98,7 +90,6 @@ def test_vCont_supports_S_llgs(self):
     @debugserver_test
     def test_single_step_only_steps_one_instruction_with_Hc_vCont_s_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(
@@ -109,7 +100,6 @@ def test_single_step_only_steps_one_instruction_with_Hc_vCont_s_debugserver(
     @skipIf(triple='^mips')
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     def test_single_step_only_steps_one_instruction_with_Hc_vCont_s_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(
@@ -119,7 +109,6 @@ def test_single_step_only_steps_one_instruction_with_Hc_vCont_s_llgs(self):
     @debugserver_test
     def test_single_step_only_steps_one_instruction_with_vCont_s_thread_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(
@@ -131,7 +120,6 @@ def test_single_step_only_steps_one_instruction_with_vCont_s_thread_debugserver(
     @expectedFailureAll(oslist=["ios", "tvos", "watchos", "bridgeos"], bugnumber="rdar://27005337")
     def test_single_step_only_steps_one_instruction_with_vCont_s_thread_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.single_step_only_steps_one_instruction(

diff  --git a/lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py b/lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py
index e16a28a335ad..e9ad057e369b 100644
--- a/lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py
+++ b/lldb/test/API/tools/lldb-server/TestGdbRemote_vContThreads.py
@@ -47,7 +47,6 @@ def signal_one_thread(self):
     @skipUnlessPlatform(["netbsd"])
     @debugserver_test
     def test_signal_one_thread_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_one_thread()
@@ -55,7 +54,6 @@ def test_signal_one_thread_debugserver(self):
     @skipUnlessPlatform(["netbsd"])
     @llgs_test
     def test_signal_one_thread_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_one_thread()
@@ -76,7 +74,6 @@ def signal_all_threads(self):
     @skipUnlessPlatform(["netbsd"])
     @debugserver_test
     def test_signal_all_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_all_threads()
@@ -84,7 +81,6 @@ def test_signal_all_threads_debugserver(self):
     @skipUnlessPlatform(["netbsd"])
     @llgs_test
     def test_signal_all_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_all_threads()
@@ -105,7 +101,6 @@ def signal_two_of_three_threads(self):
     @skipUnlessPlatform(["netbsd"])
     @debugserver_test
     def test_signal_two_of_three_threads_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_two_of_three_threads()
@@ -113,7 +108,6 @@ def test_signal_two_of_three_threads_debugserver(self):
     @skipUnlessPlatform(["netbsd"])
     @llgs_test
     def test_signal_two_of_three_threads_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_two_of_three_threads()
@@ -134,7 +128,6 @@ def signal_two_signals(self):
     @skipUnlessPlatform(["netbsd"])
     @debugserver_test
     def test_signal_two_signals_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_two_signals()
@@ -142,7 +135,6 @@ def test_signal_two_signals_debugserver(self):
     @skipUnlessPlatform(["netbsd"])
     @llgs_test
     def test_signal_two_signals_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.signal_two_signals()

diff  --git a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
index 8a9b7187a716..d3bbfe03dbd8 100644
--- a/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
+++ b/lldb/test/API/tools/lldb-server/TestLldbGdbServer.py
@@ -27,12 +27,10 @@ class LldbGdbServerTestCase(gdbremote_testcase.GdbRemoteTestCaseBase, DwarfOpcod
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_exe_starts_debugserver(self):
-        self.init_debugserver_test()
         server = self.connect_to_debug_monitor()
 
     @llgs_test
     def test_exe_starts_llgs(self):
-        self.init_llgs_test()
         server = self.connect_to_debug_monitor()
 
     def thread_suffix_supported(self):
@@ -50,12 +48,10 @@ def thread_suffix_supported(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_thread_suffix_supported_debugserver(self):
-        self.init_debugserver_test()
         self.thread_suffix_supported()
 
     @llgs_test
     def test_thread_suffix_supported_llgs(self):
-        self.init_llgs_test()
         self.thread_suffix_supported()
 
     def list_threads_in_stop_reply_supported(self):
@@ -72,12 +68,10 @@ def list_threads_in_stop_reply_supported(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_list_threads_in_stop_reply_supported_debugserver(self):
-        self.init_debugserver_test()
         self.list_threads_in_stop_reply_supported()
 
     @llgs_test
     def test_list_threads_in_stop_reply_supported_llgs(self):
-        self.init_llgs_test()
         self.list_threads_in_stop_reply_supported()
 
     def c_packet_works(self):
@@ -92,13 +86,11 @@ def c_packet_works(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_c_packet_works_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.c_packet_works()
 
     @llgs_test
     def test_c_packet_works_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.c_packet_works()
 
@@ -117,7 +109,6 @@ def inferior_print_exit(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_inferior_print_exit_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.inferior_print_exit()
 
@@ -125,7 +116,6 @@ def test_inferior_print_exit_debugserver(self):
     @llgs_test
     @expectedFlakeyLinux("llvm.org/pr25652")
     def test_inferior_print_exit_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.inferior_print_exit()
 
@@ -145,13 +135,11 @@ def first_launch_stop_reply_thread_matches_first_qC(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_first_launch_stop_reply_thread_matches_first_qC_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.first_launch_stop_reply_thread_matches_first_qC()
 
     @llgs_test
     def test_first_launch_stop_reply_thread_matches_first_qC_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.first_launch_stop_reply_thread_matches_first_qC()
 
@@ -181,14 +169,12 @@ def attach_commandline_continue_app_exits(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_attach_commandline_continue_app_exits_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_continue_app_exits()
 
     @llgs_test
     def test_attach_commandline_continue_app_exits_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.attach_commandline_continue_app_exits()
@@ -212,13 +198,11 @@ def qRegisterInfo_returns_one_valid_result(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qRegisterInfo_returns_one_valid_result_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.qRegisterInfo_returns_one_valid_result()
 
     @llgs_test
     def test_qRegisterInfo_returns_one_valid_result_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qRegisterInfo_returns_one_valid_result()
 
@@ -237,13 +221,11 @@ def qRegisterInfo_returns_all_valid_results(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qRegisterInfo_returns_all_valid_results_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.qRegisterInfo_returns_all_valid_results()
 
     @llgs_test
     def test_qRegisterInfo_returns_all_valid_results_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qRegisterInfo_returns_all_valid_results()
 
@@ -278,13 +260,11 @@ def qRegisterInfo_contains_required_generics(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qRegisterInfo_contains_required_generics_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.qRegisterInfo_contains_required_generics()
 
     @llgs_test
     def test_qRegisterInfo_contains_required_generics_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qRegisterInfo_contains_required_generics()
 
@@ -308,13 +288,11 @@ def qRegisterInfo_contains_at_least_one_register_set(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qRegisterInfo_contains_at_least_one_register_set_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.qRegisterInfo_contains_at_least_one_register_set()
 
     @llgs_test
     def test_qRegisterInfo_contains_at_least_one_register_set_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qRegisterInfo_contains_at_least_one_register_set()
 
@@ -360,7 +338,6 @@ def qRegisterInfo_contains_avx_registers(self):
     @expectedFailureAll(oslist=["netbsd"])
     @llgs_test
     def test_qRegisterInfo_contains_avx_registers_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.qRegisterInfo_contains_avx_registers()
 
@@ -382,14 +359,12 @@ def qThreadInfo_contains_thread(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qThreadInfo_contains_thread_launch_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadInfo_contains_thread()
 
     @llgs_test
     def test_qThreadInfo_contains_thread_launch_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadInfo_contains_thread()
@@ -397,7 +372,6 @@ def test_qThreadInfo_contains_thread_launch_llgs(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qThreadInfo_contains_thread_attach_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.qThreadInfo_contains_thread()
@@ -405,7 +379,6 @@ def test_qThreadInfo_contains_thread_attach_debugserver(self):
     @expectedFailureAll(oslist=["windows"]) # expect one more thread stopped
     @llgs_test
     def test_qThreadInfo_contains_thread_attach_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.qThreadInfo_contains_thread()
@@ -441,14 +414,12 @@ def qThreadInfo_matches_qC(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qThreadInfo_matches_qC_launch_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadInfo_matches_qC()
 
     @llgs_test
     def test_qThreadInfo_matches_qC_launch_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qThreadInfo_matches_qC()
@@ -456,7 +427,6 @@ def test_qThreadInfo_matches_qC_launch_llgs(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qThreadInfo_matches_qC_attach_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.qThreadInfo_matches_qC()
@@ -464,7 +434,6 @@ def test_qThreadInfo_matches_qC_attach_debugserver(self):
     @expectedFailureAll(oslist=["windows"]) # expect one more thread stopped
     @llgs_test
     def test_qThreadInfo_matches_qC_attach_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.qThreadInfo_matches_qC()
@@ -526,7 +495,6 @@ def p_returns_correct_data_size_for_each_qRegisterInfo(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_p_returns_correct_data_size_for_each_qRegisterInfo_launch_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.p_returns_correct_data_size_for_each_qRegisterInfo()
@@ -535,7 +503,6 @@ def test_p_returns_correct_data_size_for_each_qRegisterInfo_launch_debugserver(
     @llgs_test
     def test_p_returns_correct_data_size_for_each_qRegisterInfo_launch_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.p_returns_correct_data_size_for_each_qRegisterInfo()
@@ -544,7 +511,6 @@ def test_p_returns_correct_data_size_for_each_qRegisterInfo_launch_llgs(
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_p_returns_correct_data_size_for_each_qRegisterInfo_attach_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.p_returns_correct_data_size_for_each_qRegisterInfo()
@@ -553,7 +519,6 @@ def test_p_returns_correct_data_size_for_each_qRegisterInfo_attach_debugserver(
     @llgs_test
     def test_p_returns_correct_data_size_for_each_qRegisterInfo_attach_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.p_returns_correct_data_size_for_each_qRegisterInfo()
@@ -593,7 +558,6 @@ def Hg_switches_to_3_threads(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_Hg_switches_to_3_threads_launch_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.Hg_switches_to_3_threads()
@@ -601,7 +565,6 @@ def test_Hg_switches_to_3_threads_launch_debugserver(self):
     @expectedFailureAll(oslist=["windows"]) # expect 4 threads
     @llgs_test
     def test_Hg_switches_to_3_threads_launch_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.Hg_switches_to_3_threads()
@@ -609,7 +572,6 @@ def test_Hg_switches_to_3_threads_launch_llgs(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_Hg_switches_to_3_threads_attach_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_attach()
         self.Hg_switches_to_3_threads()
@@ -617,7 +579,6 @@ def test_Hg_switches_to_3_threads_attach_debugserver(self):
     @expectedFailureAll(oslist=["windows"]) # expecting one more thread
     @llgs_test
     def test_Hg_switches_to_3_threads_attach_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_attach()
         self.Hg_switches_to_3_threads()
@@ -737,7 +698,6 @@ def Hc_then_Csignal_signals_correct_thread(self, segfault_signo):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_Hc_then_Csignal_signals_correct_thread_launch_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         # Darwin debugserver translates some signals like SIGSEGV into some gdb
@@ -749,7 +709,6 @@ def test_Hc_then_Csignal_signals_correct_thread_launch_debugserver(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_Hc_then_Csignal_signals_correct_thread_launch_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.Hc_then_Csignal_signals_correct_thread(
@@ -810,7 +769,6 @@ def m_packet_reads_memory(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_m_packet_reads_memory_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.m_packet_reads_memory()
@@ -818,7 +776,6 @@ def test_m_packet_reads_memory_debugserver(self):
     @skipIfWindows # No pty support to test any inferior output
     @llgs_test
     def test_m_packet_reads_memory_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.m_packet_reads_memory()
@@ -837,14 +794,12 @@ def qMemoryRegionInfo_is_supported(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qMemoryRegionInfo_is_supported_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_is_supported()
 
     @llgs_test
     def test_qMemoryRegionInfo_is_supported_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_is_supported()
@@ -901,7 +856,6 @@ def qMemoryRegionInfo_reports_code_address_as_executable(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qMemoryRegionInfo_reports_code_address_as_executable_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_code_address_as_executable()
@@ -909,7 +863,6 @@ def test_qMemoryRegionInfo_reports_code_address_as_executable_debugserver(
     @skipIfWindows # No pty support to test any inferior output
     @llgs_test
     def test_qMemoryRegionInfo_reports_code_address_as_executable_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_code_address_as_executable()
@@ -967,7 +920,6 @@ def qMemoryRegionInfo_reports_stack_address_as_readable_writeable(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qMemoryRegionInfo_reports_stack_address_as_readable_writeable_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_stack_address_as_readable_writeable()
@@ -976,7 +928,6 @@ def test_qMemoryRegionInfo_reports_stack_address_as_readable_writeable_debugserv
     @llgs_test
     def test_qMemoryRegionInfo_reports_stack_address_as_readable_writeable_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_stack_address_as_readable_writeable()
@@ -1033,7 +984,6 @@ def qMemoryRegionInfo_reports_heap_address_as_readable_writeable(self):
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qMemoryRegionInfo_reports_heap_address_as_readable_writeable_debugserver(
             self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_heap_address_as_readable_writeable()
@@ -1042,7 +992,6 @@ def test_qMemoryRegionInfo_reports_heap_address_as_readable_writeable_debugserve
     @llgs_test
     def test_qMemoryRegionInfo_reports_heap_address_as_readable_writeable_llgs(
             self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qMemoryRegionInfo_reports_heap_address_as_readable_writeable()
@@ -1182,7 +1131,6 @@ def breakpoint_set_and_remove_work(self, want_hardware=False):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_software_breakpoint_set_and_remove_work_debugserver(self):
-        self.init_debugserver_test()
         if self.getArchitecture() == "arm":
             # TODO: Handle case when setting breakpoint in thumb code
             self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
@@ -1195,7 +1143,6 @@ def test_software_breakpoint_set_and_remove_work_debugserver(self):
     @llgs_test
     @expectedFlakeyLinux("llvm.org/pr25652")
     def test_software_breakpoint_set_and_remove_work_llgs(self):
-        self.init_llgs_test()
         if self.getArchitecture() == "arm":
             # TODO: Handle case when setting breakpoint in thumb code
             self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
@@ -1210,7 +1157,6 @@ def test_software_breakpoint_set_and_remove_work_llgs(self):
     @skipIf(archs=no_match(['arm', 'aarch64']))
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_hardware_breakpoint_set_and_remove_work_debugserver(self):
-        self.init_debugserver_test()
         if self.getArchitecture() == "arm":
             # TODO: Handle case when setting breakpoint in thumb code
             self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
@@ -1223,7 +1169,6 @@ def test_hardware_breakpoint_set_and_remove_work_debugserver(self):
     @skipUnlessPlatform(oslist=['linux'])
     @skipIf(archs=no_match(['arm', 'aarch64']))
     def test_hardware_breakpoint_set_and_remove_work_llgs(self):
-        self.init_llgs_test()
         if self.getArchitecture() == "arm":
             # TODO: Handle case when setting breakpoint in thumb code
             self.build(dictionary={'CFLAGS_EXTRAS': '-marm'})
@@ -1249,14 +1194,12 @@ def qSupported_returns_known_stub_features(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_qSupported_returns_known_stub_features_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qSupported_returns_known_stub_features()
 
     @llgs_test
     def test_qSupported_returns_known_stub_features_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.qSupported_returns_known_stub_features()
@@ -1323,7 +1266,6 @@ def written_M_content_reads_back_correctly(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_written_M_content_reads_back_correctly_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.written_M_content_reads_back_correctly()
@@ -1332,7 +1274,6 @@ def test_written_M_content_reads_back_correctly_debugserver(self):
     @llgs_test
     @expectedFlakeyLinux("llvm.org/pr25652")
     def test_written_M_content_reads_back_correctly_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.written_M_content_reads_back_correctly()
@@ -1374,14 +1315,12 @@ def P_writes_all_gpr_registers(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_P_writes_all_gpr_registers_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.P_writes_all_gpr_registers()
 
     @llgs_test
     def test_P_writes_all_gpr_registers_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.P_writes_all_gpr_registers()
@@ -1499,7 +1438,6 @@ def P_and_p_thread_suffix_work(self):
     @debugserver_test
     @skipIfDarwinEmbedded # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     def test_P_and_p_thread_suffix_work_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.set_inferior_startup_launch()
         self.P_and_p_thread_suffix_work()
@@ -1507,7 +1445,6 @@ def test_P_and_p_thread_suffix_work_debugserver(self):
     @skipIfWindows
     @llgs_test
     def test_P_and_p_thread_suffix_work_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.P_and_p_thread_suffix_work()

diff  --git a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
index 70224ecadb0d..dda7d707a56f 100644
--- a/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
+++ b/lldb/test/API/tools/lldb-server/commandline/TestGdbRemoteConnection.py
@@ -15,13 +15,11 @@ class TestGdbRemoteConnection(gdbremote_testcase.GdbRemoteTestCaseBase):
     # <rdar://problem/34539270> lldb-server tests not updated to work on ios etc yet
     @skipIfDarwinEmbedded
     def test_reverse_connect_debugserver(self):
-        self.init_debugserver_test()
         self._reverse_connect()
 
     @llgs_test
     @skipIfRemote  # reverse connect is not a supported use case for now
     def test_reverse_connect_llgs(self):
-        self.init_llgs_test()
         self._reverse_connect()
 
     def _reverse_connect(self):
@@ -33,14 +31,12 @@ def _reverse_connect(self):
     @debugserver_test
     @skipIfRemote
     def test_named_pipe_debugserver(self):
-        self.init_debugserver_test()
         self._named_pipe()
 
     @llgs_test
     @skipIfRemote
     @skipIfWindows
     def test_named_pipe_llgs(self):
-        self.init_llgs_test()
         self._named_pipe()
 
     def _named_pipe(self):

diff  --git a/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py b/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
index 51c2966b8c9f..21005b6a6b64 100644
--- a/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
+++ b/lldb/test/API/tools/lldb-server/commandline/TestStubSetSID.py
@@ -42,7 +42,6 @@ def sid_is_
diff erent_with_S(self):
     @debugserver_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_same_without_setsid_debugserver(self):
-        self.init_debugserver_test()
         self.set_inferior_startup_launch()
         self.sid_is_same_without_setsid()
 
@@ -50,14 +49,12 @@ def test_sid_is_same_without_setsid_debugserver(self):
     @llgs_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_same_without_setsid_llgs(self):
-        self.init_llgs_test()
         self.set_inferior_startup_launch()
         self.sid_is_same_without_setsid()
 
     @debugserver_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_
diff erent_with_setsid_debugserver(self):
-        self.init_debugserver_test()
         self.set_inferior_startup_launch()
         self.sid_is_
diff erent_with_setsid()
 
@@ -65,14 +62,12 @@ def test_sid_is_
diff erent_with_setsid_debugserver(self):
     @llgs_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_
diff erent_with_setsid_llgs(self):
-        self.init_llgs_test()
         self.set_inferior_startup_launch()
         self.sid_is_
diff erent_with_setsid()
 
     @debugserver_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_
diff erent_with_S_debugserver(self):
-        self.init_debugserver_test()
         self.set_inferior_startup_launch()
         self.sid_is_
diff erent_with_S()
 
@@ -80,6 +75,5 @@ def test_sid_is_
diff erent_with_S_debugserver(self):
     @llgs_test
     @skipIfRemote  # --setsid not used on remote platform and currently it is also impossible to get the sid of lldb-platform running on a remote target
     def test_sid_is_
diff erent_with_S_llgs(self):
-        self.init_llgs_test()
         self.set_inferior_startup_launch()
         self.sid_is_
diff erent_with_S()

diff  --git a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
index 5292913aa42e..8bce3b9aa87b 100644
--- a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
+++ b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteAbort.py
@@ -31,7 +31,6 @@ def inferior_abort_received(self):
 
     @debugserver_test
     def test_inferior_abort_received_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.inferior_abort_received()
 
@@ -40,6 +39,5 @@ def test_inferior_abort_received_debugserver(self):
     # std::abort() on <= API 16 raises SIGSEGV - b.android.com/179836
     @expectedFailureAndroid(api_levels=list(range(16 + 1)))
     def test_inferior_abort_received_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.inferior_abort_received()

diff  --git a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
index e0ba3d7eb684..b9b4bef01177 100644
--- a/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
+++ b/lldb/test/API/tools/lldb-server/inferior-crash/TestGdbRemoteSegFault.py
@@ -33,13 +33,11 @@ def inferior_seg_fault_received(self, expected_signo):
 
     @debugserver_test
     def test_inferior_seg_fault_received_debugserver(self):
-        self.init_debugserver_test()
         self.build()
         self.inferior_seg_fault_received(self.GDB_REMOTE_STOP_CODE_BAD_ACCESS)
 
     @skipIfWindows # No signal is sent on Windows.
     @llgs_test
     def test_inferior_seg_fault_received_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.inferior_seg_fault_received(lldbutil.get_signal_number('SIGSEGV'))

diff  --git a/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py b/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
index 902a17639d56..aa2cf19bbf5a 100644
--- a/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
+++ b/lldb/test/API/tools/lldb-server/libraries-svr4/TestGdbRemoteLibrariesSvr4Support.py
@@ -12,7 +12,6 @@ class TestGdbRemoteLibrariesSvr4Support(gdbremote_testcase.GdbRemoteTestCaseBase
     FEATURE_NAME = "qXfer:libraries-svr4:read"
 
     def setup_test(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         env = {}

diff  --git a/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py b/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
index 954eb23f05af..dc8f63687209 100644
--- a/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
+++ b/lldb/test/API/tools/lldb-server/memory-allocation/TestGdbRemoteMemoryAllocation.py
@@ -51,7 +51,6 @@ def allocate(self, size, permissions):
     def test_supported(self):
         """Make sure (de)allocation works on platforms where it's supposed to
         work"""
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()
@@ -68,7 +67,6 @@ def test_unsupported(self):
         """Make sure we get an "unsupported" error on platforms where the
         feature is not implemented."""
 
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()
@@ -83,7 +81,6 @@ def test_unsupported(self):
     def test_bad_packet(self):
         """Make sure we get a proper error for malformed packets."""
 
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()

diff  --git a/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py b/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py
index fcfb0a829e03..177388fad5fc 100644
--- a/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py
+++ b/lldb/test/API/tools/lldb-server/platform-process-connect/TestPlatformProcessConnect.py
@@ -16,7 +16,6 @@ class TestPlatformProcessConnect(gdbremote_testcase.GdbRemoteTestCaseBase):
     @expectedFailureAll(hostoslist=["windows"], triple='.*-android')
     def test_platform_process_connect(self):
         self.build()
-        self.init_llgs_test()
 
         working_dir = lldb.remote_platform.GetWorkingDirectory()
         src = lldb.SBFileSpec(self.getBuildArtifact("a.out"))

diff  --git a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
index a61187b2cf28..1380b63955b7 100644
--- a/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
+++ b/lldb/test/API/tools/lldb-server/register-reading/TestGdbRemoteGPacket.py
@@ -53,7 +53,6 @@ def run_test_g_packet(self):
     @debugserver_test
     @skipIfDarwinEmbedded
     def test_g_packet_debugserver(self):
-        self.init_debugserver_test()
         self.run_test_g_packet()
 
     @skipIf(archs=no_match(["x86_64"]))
@@ -140,7 +139,6 @@ def g_returns_correct_data(self, with_suffix):
     @expectedFailureNetBSD
     @llgs_test
     def test_g_returns_correct_data_with_suffix_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.g_returns_correct_data(True)
@@ -149,7 +147,6 @@ def test_g_returns_correct_data_with_suffix_llgs(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_g_returns_correct_data_no_suffix_llgs(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         self.g_returns_correct_data(False)

diff  --git a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
index cd14fcf8125c..3e8951ce6941 100644
--- a/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
+++ b/lldb/test/API/tools/lldb-server/registers-target-xml-reading/TestGdbRemoteTargetXmlPacket.py
@@ -15,7 +15,6 @@ class TestGdbRemoteTargetXmlPacket(gdbremote_testcase.GdbRemoteTestCaseBase):
     @expectedFailureNetBSD
     @llgs_test
     def test_g_target_xml_returns_correct_data(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
 

diff  --git a/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py b/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
index 72e0d94d4de9..946d53341bef 100644
--- a/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
+++ b/lldb/test/API/tools/lldb-server/signal-filtering/TestGdbRemote_QPassSignals.py
@@ -49,7 +49,6 @@ def signal_name_to_hex(signame):
     @llgs_test
     @skipUnlessPlatform(["linux", "android"])
     def test_q_pass_signals(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()
@@ -65,7 +64,6 @@ def test_q_pass_signals(self):
     @llgs_test
     @skipUnlessPlatform(["linux", "android"])
     def test_change_signals_at_runtime(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()
@@ -84,7 +82,6 @@ def test_change_signals_at_runtime(self):
     @expectedFailureNetBSD
     @llgs_test
     def test_default_signals_behavior(self):
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()
@@ -99,7 +96,6 @@ def test_default_signals_behavior(self):
     @llgs_test
     @skipUnlessPlatform(["linux", "android"])
     def test_support_q_pass_signals(self):
-        self.init_llgs_test()
         self.build()
 
         # Start up the stub and start/prep the inferior.

diff  --git a/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py b/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
index 9ec40c117428..16978b056044 100644
--- a/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
+++ b/lldb/test/API/tools/lldb-server/thread-name/TestGdbRemoteThreadName.py
@@ -32,7 +32,6 @@ def run_and_check_name(self, expected_name):
     @llgs_test
     def test(self):
         """ Make sure lldb-server can retrieve inferior thread name"""
-        self.init_llgs_test()
         self.build()
         self.set_inferior_startup_launch()
         procs = self.prep_debug_monitor_and_inferior()


        


More information about the lldb-commits mailing list