diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index d6462e9db418f930c00008492937de17e8463118..67bb37d41c25939eae308e71381c0f29ffd38316 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3453,7 +3453,7 @@ void GdbEngine::handleStackFrame1(const GdbResponse &response)
//qDebug() << "FIRST CHUNK: " << out;
m_firstChunk = out;
} else {
- QTC_ASSERT(false, /**/);
+ QTC_ASSERT(false, qDebug() << response.toString());
}
}
diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 55e03207bdb65d8a1bda5e6134e6760f06205164..3e18cd43f7d3cb1d78a49a992382062fb0c16210 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -636,6 +636,12 @@ QString decodeData(const QByteArray &ba, int encoding)
case 5: { // base64 encoded 8 bit data, without quotes (see 1)
return quoteUnprintableLatin1(QByteArray::fromBase64(ba));
}
+ case 6: { // %02x encoded 8 bit data
+ const QChar doubleQuote(QLatin1Char('"'));
+ const QByteArray decodedBa = QByteArray::fromHex(ba);
+ //qDebug() << quoteUnprintableLatin1(decodedBa) << "\n\n";
+ return doubleQuote + QString::fromLatin1(decodedBa) + doubleQuote;
+ }
case 7: { // %04x encoded 16 bit data
const QChar doubleQuote(QLatin1Char('"'));
const QByteArray decodedBa = QByteArray::fromHex(ba);
@@ -644,6 +650,7 @@ QString decodeData(const QByteArray &ba, int encoding)
(decodedBa.data()), decodedBa.size() / 2) + doubleQuote;
}
}
+ qDebug() << "ENCODING ERROR: " << encoding;
return QCoreApplication::translate("Debugger", "<Encoding error>");
}
diff --git a/tests/auto/debugger/tst_gdb.cpp b/tests/auto/debugger/tst_gdb.cpp
index 9e2f62d73ec9093d294e9e90691393acc20294b1..bff9d166017004e70751b1bf7b51177f01235ab7 100644
--- a/tests/auto/debugger/tst_gdb.cpp
+++ b/tests/auto/debugger/tst_gdb.cpp
@@ -140,6 +140,7 @@ private slots:
void dumpMisc();
void dumpQByteArray();
void dumpQChar();
+ void dumpQList_char_star();
void dumpQList_char();
void dumpQList_int();
void dumpQList_QString();
@@ -2168,7 +2169,8 @@ void Thread::readStandardOutput()
DEBUG(" LINE 2: " << m_line);
}
if (ba.startsWith("^error,msg=")) {
- qWarning() << "ERROR: " << ba.mid(1, ba.size() - 3);
+ if (!ba.startsWith("^error,msg=\"The program being debugged stopped"))
+ qWarning() << "ERROR: " << ba.mid(1, ba.size() - 3);
}
if (ba.startsWith("~\"XXX: ")) {
@@ -2237,7 +2239,6 @@ tst_Gdb::tst_Gdb()
}
}
-
void tst_Gdb::prepare(const QByteArray &function)
{
m_function = function;
@@ -2245,6 +2246,11 @@ void tst_Gdb::prepare(const QByteArray &function)
writeToGdb("call " + function + "()");
}
+static bool isJoker(const QByteArray &ba)
+{
+ return ba.endsWith("'-'") || ba.contains("'-'}");
+}
+
void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
const QByteArray &expanded, bool fancy)
{
@@ -2273,7 +2279,7 @@ void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
if (ok) {
for (int i = 0 ; i < l1.size(); ++i) {
// Use "-" as joker.
- if (l1.at(i) != l2.at(i) && !l2.at(i).endsWith("'-'"))
+ if (l1.at(i) != l2.at(i) && !isJoker(l2.at(i)))
ok = false;
}
} else {
@@ -2283,7 +2289,7 @@ void tst_Gdb::run(const QByteArray &label, const QByteArray &expected0,
if (!ok) {
int i = 0;
for ( ; i < l1.size() && i < l2.size(); ++i) {
- if (l1.at(i) == l2.at(i) || l2.at(i).endsWith("'-'")) {
+ if (l1.at(i) == l2.at(i) || isJoker(l2.at(i))) {
qWarning() << "== " << l1.at(i);
} else {
//qWarning() << "!= " << l1.at(i).right(30) << l2.at(i).right(30);
@@ -2336,40 +2342,41 @@ void tst_Gdb::cleanupTestCase()
void dumpQList_int()
{
- /* A */ QList<int> ilist;
- /* B */ ilist.append(1);
- /* C */ ilist.append(2);
+ /* A */ QList<int> list;
+ /* B */ list.append(1);
+ /* C */ list.append(2);
/* D */ (void) 0;
}
void tst_Gdb::dumpQList_int()
{
prepare("dumpQList_int");
- run("A","{iname='local.ilist',addr='-',name='ilist',"
- "type='"NS"QList<int>',value='<not in scope>',numchild='0'}");
+ if (checkUninitialized)
+ run("A","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<int>',value='<not in scope>',numchild='0'}");
next();
- run("B","{iname='local.ilist',addr='-',name='ilist',"
+ run("B","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<0 items>',numchild='0'}");
next();
- run("C","{iname='local.ilist',addr='-',name='ilist',"
+ run("C","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<1 items>',numchild='1'}");
- run("C","{iname='local.ilist',addr='-',name='ilist',"
+ run("C","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<1 items>',numchild='1',"
"childtype='int',childnumchild='0',children=["
- "{value='1'}]}", "local.ilist");
+ "{value='1'}]}", "local.list");
next();
- run("D","{iname='local.ilist',addr='-',name='ilist',"
+ run("D","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<2 items>',numchild='2'}");
- run("D","{iname='local.ilist',addr='-',name='ilist',"
+ run("D","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<int>',value='<2 items>',numchild='2',"
"childtype='int',childnumchild='0',children=["
- "{value='1'},{value='2'}]}", "local.ilist");
+ "{value='1'},{value='2'}]}", "local.list");
}
void dumpQList_char()
{
- /* A */ QList<char> ilist;
- /* B */ ilist.append('a');
+ /* A */ QList<char> list;
+ /* B */ list.append('a');
/* C */ (void) 0;
}
@@ -2377,18 +2384,53 @@ void tst_Gdb::dumpQList_char()
{
prepare("dumpQList_char");
if (checkUninitialized)
- run("A","{iname='local.ilist',addr='-',name='ilist',"
+ run("A","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char>',value='<not in scope>',numchild='0'}");
next();
- run("B","{iname='local.ilist',addr='-',name='ilist',"
+ run("B","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char>',value='<0 items>',numchild='0'}");
next();
- run("C","{iname='local.ilist',addr='-',name='ilist',"
+ run("C","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char>',value='<1 items>',numchild='1'}");
- run("C","{iname='local.ilist',addr='-',name='ilist',"
+ run("C","{iname='local.list',addr='-',name='list',"
"type='"NS"QList<char>',value='<1 items>',numchild='1',"
"childtype='char',childnumchild='0',children=["
- "{value='97 'a''}]}", "local.ilist");
+ "{value='97 'a''}]}", "local.list");
+}
+
+void dumpQList_char_star()
+{
+ /* A */ QList<const char *> list;
+ /* B */ list.append("a");
+ /* C */ list.append(0);
+ /* D */ list.append("bc");
+ /* E */ (void) 0;
+}
+
+void tst_Gdb::dumpQList_char_star()
+{
+ prepare("dumpQList_char_star");
+ if (checkUninitialized)
+ run("A","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<char const*>',value='<not in scope>',numchild='0'}");
+ next();
+ run("B","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<char const*>',value='<0 items>',numchild='0'}");
+ next();
+ run("C","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<char const*>',value='<1 items>',numchild='1'}");
+ run("C","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<char const*>',value='<1 items>',numchild='1',"
+ "childtype='const char *',childnumchild='1',children=["
+ "{valueencoded='6',value='61',numchild='0'}]}", "local.list");
+ next();
+ next();
+ run("E","{iname='local.list',addr='-',name='list',"
+ "type='"NS"QList<char const*>',value='<3 items>',numchild='3',"
+ "childtype='const char *',childnumchild='1',children=["
+ "{valueencoded='6',value='61',numchild='0'},"
+ "{value='0x0',numchild='0'},"
+ "{valueencoded='6',value='6263',numchild='0'}]}", "local.list");
}
void dumpQList_QString()