From b60f464c64b537bd0ec6418634d356c38c7e387d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 14 Dec 2011 15:32:48 +0100
Subject: [PATCH] debugger: run tests only after view is fully populated.
Change-Id: I730b35f9384d672a613e79842b21709a12b9a95f
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/gdb/gdbengine.cpp | 25 +++++++++-----------
src/plugins/debugger/gdb/pythongdbengine.cpp | 1 -
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index ccd15ef8a00..9232ac17703 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1636,7 +1636,7 @@ void GdbEngine::handleStop1(const GdbMi &data)
if (name == stopSignal(sp.toolChainAbi)) {
showMessage(_(name + " CONSIDERED HARMLESS. CONTINUING."));
} else {
- showMessage(_("HANDLING SIGNAL" + name));
+ showMessage(_("HANDLING SIGNAL " + name));
if (debuggerCore()->boolSetting(UseMessageBoxForSignals)
&& !isStopperThread)
showStoppedBySignalMessageBox(_(meaning), _(name));
@@ -2278,20 +2278,16 @@ void GdbEngine::handleExecuteReturn(const GdbResponse &response)
void GdbEngine::setTokenBarrier()
{
- if (m_nonDiscardableCount > 0) {
- showMessage(_("--- CANNOT SET TOKEN BARRIER: "), LogMiscInput);
- foreach (const GdbCommand &cookie, m_cookieForToken)
- showMessage(QString::fromLatin1("CMD: %1, FLAGS: %2")
- .arg(_(cookie.command)).arg(cookie.flags), LogMiscInput);
- QTC_ASSERT(false, return);
- return;
- }
+ QTC_ASSERT(m_nonDiscardableCount > 0, /**/);
bool good = true;
- foreach (const GdbCommand &cookie, m_cookieForToken) {
- if (!(cookie.flags & Discardable)) {
- qDebug() << "CMD:" << cookie.command
- << " FLAGS:" << cookie.flags
- << " CALLBACK:" << cookie.callbackName;
+ QHashIterator<int, GdbCommand> it(m_cookieForToken);
+ while (it.hasNext()) {
+ it.next();
+ if (!(it.value().flags & Discardable)) {
+ qDebug() << "TOKEN: " << it.key()
+ << "CMD:" << it.value().command
+ << " FLAGS:" << it.value().flags
+ << " CALLBACK:" << it.value().callbackName;
good = false;
}
}
@@ -3970,6 +3966,7 @@ void GdbEngine::rebuildWatchModel()
showStatusMessage(tr("Finished retrieving data"), 400);
watchHandler()->endCycle();
showToolTip();
+ handleAutoTests();
}
static QByteArray arrayFillCommand(const char *array, const QByteArray ¶ms)
diff --git a/src/plugins/debugger/gdb/pythongdbengine.cpp b/src/plugins/debugger/gdb/pythongdbengine.cpp
index 81baea0fe9c..ae3a053cc6a 100644
--- a/src/plugins/debugger/gdb/pythongdbengine.cpp
+++ b/src/plugins/debugger/gdb/pythongdbengine.cpp
@@ -193,7 +193,6 @@ void GdbEngine::handleStackFramePython(const GdbResponse &response)
}
if (!partial)
emit stackFrameCompleted();
- handleAutoTests();
} else {
showMessage(_("DUMPER FAILED: " + response.toString()));
}
--
GitLab