maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add teardown hook to shutdown an inferior process 

Summary: Add teardown hook to shutdown an inferior process

Reviewers: jasonmolenda, clayborg, tberghammer

Reviewed By: clayborg, tberghammer

Subscribers: lldb-commits, tberghammer, clayborg, jasonmolenda

Differential Revision: http://reviews.llvm.org/D9018

llvm-svn: 235005
This commit is contained in:
Ilia K 2015-04-15 13:08:35 +00:00
parent bf0db6caae
commit 7c1d91d816
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lldb/test/tools/lldb-server/gdbremote_testcase.py
View File

@ -263,7 +263,7 @@ class GdbRemoteTestCaseBase(TestBase):
try: try:
server.terminate() server.terminate()
except: 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) self.addTearDownHook(shutdown_debug_monitor)
# Schedule debug monitor to be shut down during teardown. # Schedule debug monitor to be shut down during teardown.
@ -333,7 +333,14 @@ class GdbRemoteTestCaseBase(TestBase):
if sleep_seconds: if sleep_seconds:
args.append("sleep:%d" % 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): 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. """Prep the debug monitor, the inferior, and the expected packet stream.