Add teardown hook to shutdown an inferior process

[ki.stfu]

Summary

Add teardown hook to shutdown an inferior process

[tberghammer]

test/tools/lldb-server/gdbremote_testcase.py

341

nit: pexpect don't make too much sense in the comment anymore

[ki.stfu]

test/tools/lldb-server/gdbremote_testcase.py

266

from here

341

Ok. FYI: It was copied from line #266.

[ki.stfu]

Update warn messages

test/tools/lldb-server/gdbremote_testcase.py

def connect_to_debug_monitor(self, attach_pid=None):
             # Create the stub.
             server = self.launch_debug_monitor(attach_pid=attach_pid)
             self.assertIsNotNone(server)
 
             def shutdown_debug_monitor():
                 try:
                     server.terminate()
                 except:
-                    logger.warning("failed to close pexpect server for debug monitor: {}; ignoring".format(sys.exc_info()[0]))
+                    logger.warning("failed to terminate server for debug monitor: {}; ignoring".format(sys.exc_info()[0]))
             self.addTearDownHook(shutdown_debug_monitor)
 
             # Schedule debug monitor to be shut down during teardown.
             logger = self.logger
 
             # Attach to the stub and return a socket opened to it.
             self.sock = self.create_socket()
             return server
def launch_process_for_attach(self, inferior_args=None, sleep_seconds=3, exe_path=None):
             exe_path = os.path.abspath("a.out")
 
         args = []
         if inferior_args:
             args.extend(inferior_args)
         if sleep_seconds:
             args.append("sleep:%d" % sleep_seconds)
 
-        return self.spawnSubprocess(exe_path, args)
+        inferior = self.spawnSubprocess(exe_path, args)
+        def shutdown_process_for_attach():
+            try:
+                inferior.terminate()
+            except:
+                logger.warning("failed to terminate inferior process for attach: {}; ignoring".format(sys.exc_info()[0]))
+        self.addTearDownHook(shutdown_process_for_attach)
+        return inferior
 
     def prep_debug_monitor_and_inferior(self, inferior_args=None, inferior_sleep_seconds=3, inferior_exe_path=None):
         """Prep the debug monitor, the inferior, and the expected packet stream.
 
         Handle the separate cases of using the debug monitor in attach-to-inferior mode
         and in launch-inferior mode.
 
         For attach-to-inferior mode, the inferior process is first started, then