diff options
| -rw-r--r-- | lldb/source/Core/Debugger.cpp | 2 | ||||
| -rw-r--r-- | lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp | 1 | ||||
| -rw-r--r-- | lldb/test/lldbtest.py | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp index ee33ec53f49..1cdd7ad4d87 100644 --- a/lldb/source/Core/Debugger.cpp +++ b/lldb/source/Core/Debugger.cpp @@ -479,7 +479,7 @@ Debugger::UpdateExecutionContext (ExecutionContext *override_context) { m_exe_ctx.target = target_sp.get(); m_exe_ctx.process = target_sp->GetProcessSP().get(); - if (m_exe_ctx.process && m_exe_ctx.process->IsRunning() == false) + if (m_exe_ctx.process && m_exe_ctx.process->IsAlive() && !m_exe_ctx.process->IsRunning()) { m_exe_ctx.thread = m_exe_ctx.process->GetThreadList().GetSelectedThread().get(); if (m_exe_ctx.thread == NULL) diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp index 815ceceb036..c9f864f02e4 100644 --- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp +++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp @@ -1171,6 +1171,7 @@ ProcessGDBRemote::DoDestroy () StopAsyncThread (); m_gdb_comm.StopReadThread(); KillDebugserverProcess (); + m_gdb_comm.Disconnect(); // Disconnect from the debug server. return error; } diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py index 0a4282a9284..51d2afd534e 100644 --- a/lldb/test/lldbtest.py +++ b/lldb/test/lldbtest.py @@ -355,12 +355,12 @@ class TestBase(unittest2.TestCase): else: print >> sys.stderr, self.res.GetError() + if running: + # For process launch, wait some time before possible next try. + time.sleep(self.timeWait) + if self.res.Succeeded(): break - else: - if running: - # Process launch failed, wait some time before the next try. - time.sleep(self.timeWait) # Modify runStarted only if "run" or "process launch" was encountered. if running: |
