feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: dumpertest: Dump expanded locals

Browse Source 
...separate for the cdbengine. Workaround for
all symbols with virtual children.

Change-Id: I166b30af6594bde1093896156d86b28f02ed8a6a
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
David Schulz
2013-03-21 15:43:10 -07:00
committed by hjk
parent 5041378c6c
commit f9c31b4c6b
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -460,7 +460,6 @@ void tst_Dumpers::initTestCase()
const QByteArray cdbextPath = QByteArray(CDBEXT_PATH) + QByteArray("\\qtcreatorcdbext64"); const QByteArray cdbextPath = QByteArray(CDBEXT_PATH) + QByteArray("\\qtcreatorcdbext64");
QVERIFY(QFile::exists(QString::fromLatin1(cdbextPath + QByteArray("\\qtcreatorcdbext.dll")))); QVERIFY(QFile::exists(QString::fromLatin1(cdbextPath + QByteArray("\\qtcreatorcdbext.dll"))));
qDebug() << cdbextPath;
utilsEnv.appendOrSet(QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), utilsEnv.appendOrSet(QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"),
QString::fromLatin1(cdbextPath), QString::fromLatin1(cdbextPath),
QLatin1String(";")); QLatin1String(";"));
@@ -644,8 +643,15 @@ void tst_Dumpers::dumper()
"sxi 0x4000001f\n" "sxi 0x4000001f\n"
"g\n" "g\n"
"gu\n" "gu\n"
"!qtcreatorcdbext.locals -t 2 -D -e " + expanded + ",return,watch,inspect -v -c -W 0\n" "!qtcreatorcdbext.expandlocals -t 0 -c 0 " + expanded + "\n";
"q\n"; int token = 0;
QStringList sortediNames;
foreach (QByteArray iName, expandedINames)
sortediNames << QString::fromLatin1(iName);
sortediNames.sort();
foreach (QString iName, sortediNames)
cmds += "!qtcreatorcdbext.locals -t " + QByteArray::number(++token) + " -c 0 " + iName.toLatin1() + "\n";
cmds += "q\n";
} else if (m_debuggerEngine == LldbEngine) { } else if (m_debuggerEngine == LldbEngine) {
cmds = "script execfile('" + dumperDir + "/bridge.py')\n" cmds = "script execfile('" + dumperDir + "/bridge.py')\n"
"script execfile('" + dumperDir + "/dumper.py')\n" "script execfile('" + dumperDir + "/dumper.py')\n"
@@ -705,16 +711,20 @@ void tst_Dumpers::dumper()
int pos1 = output.indexOf(locals); int pos1 = output.indexOf(locals);
QVERIFY(pos1 != -1); QVERIFY(pos1 != -1);
do { do {
pos1 += locals.length();
if (output.at(pos1) == '[')
++pos1;
int pos2 = output.indexOf("\n", pos1); int pos2 = output.indexOf("\n", pos1);
QVERIFY(pos2 != -1); QVERIFY(pos2 != -1);
pos1 += locals.length(); if (output.at(pos2 - 1) == ']')
--pos2;
contents += output.mid(pos1, pos2 - pos1); contents += output.mid(pos1, pos2 - pos1);
pos1 = output.indexOf(locals, pos2); pos1 = output.indexOf(locals, pos2);
} while (pos1 != -1); } while (pos1 != -1);
} }
GdbMi actual; GdbMi actual;
actual.fromString(contents); actual.fromStringMultiple(contents);
WatchData local; WatchData local;
local.iname = "local"; local.iname = "local";