Commit f27c5cc6 authored by hjk's avatar hjk
Browse files

debugger: make debian testing happy

parent f1af5fb4
...@@ -339,7 +339,7 @@ static const QByteArray specLong(long n) ...@@ -339,7 +339,7 @@ static const QByteArray specLong(long n)
static const QByteArray ptrToBa(const void *p, bool symbolicNull = true) static const QByteArray ptrToBa(const void *p, bool symbolicNull = true)
{ {
return QByteArray().append(p == 0 && symbolicNull ? return QByteArray().append(p == 0 && symbolicNull ?
"<null>" : "(null)" :
QByteArray("0x") + N((quintptr) p, 16)); QByteArray("0x") + N((quintptr) p, 16));
} }
...@@ -586,6 +586,8 @@ void Thread::handleGdbStarted() ...@@ -586,6 +586,8 @@ void Thread::handleGdbStarted()
void Thread::run() void Thread::run()
{ {
m_proc->write("source -p ../../../share/qtcreator/gdbmacros/dumper.py\n");
m_proc->write("source -p ../../../share/qtcreator/gdbmacros/gdbmacros.py\n");
m_proc->write("break breaker\n"); m_proc->write("break breaker\n");
m_proc->write("run\n"); m_proc->write("run\n");
m_proc->write("handle SIGSTOP stop pass\n"); m_proc->write("handle SIGSTOP stop pass\n");
...@@ -1669,7 +1671,7 @@ void tst_Gdb::dump_QList_int_star() ...@@ -1669,7 +1671,7 @@ void tst_Gdb::dump_QList_int_star()
run("E","{iname='local.list',name='list'," run("E","{iname='local.list',name='list',"
"type='"NS"QList<int*>',value='<3 items>',numchild='3'," "type='"NS"QList<int*>',value='<3 items>',numchild='3',"
"childtype='int',childnumchild='0',children=[" "childtype='int',childnumchild='0',children=["
"{value='1'},{value='<null>',type='int *'},{value='2'}]}", "local.list"); "{value='1'},{value='(null)',type='int *'},{value='2'}]}", "local.list");
} }
...@@ -2612,7 +2614,7 @@ void tst_Gdb::dump_QSharedPointer() ...@@ -2612,7 +2614,7 @@ void tst_Gdb::dump_QSharedPointer()
next(8); next(8);
run("C","{iname='local.simplePtr',name='simplePtr'," run("C","{iname='local.simplePtr',name='simplePtr',"
"type='"NS"QSharedPointer<int>',value='<null>',numchild='0'}," "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.simplePtr2',name='simplePtr2'," "{iname='local.simplePtr2',name='simplePtr2',"
"type='"NS"QSharedPointer<int>',value='',numchild='3'}," "type='"NS"QSharedPointer<int>',value='',numchild='3'},"
"{iname='local.simplePtr3',name='simplePtr3'," "{iname='local.simplePtr3',name='simplePtr3',"
...@@ -2620,7 +2622,7 @@ void tst_Gdb::dump_QSharedPointer() ...@@ -2620,7 +2622,7 @@ void tst_Gdb::dump_QSharedPointer()
"{iname='local.simplePtr4',name='simplePtr4'," "{iname='local.simplePtr4',name='simplePtr4',"
"type='"NS"QWeakPointer<int>',value='',numchild='3'}," "type='"NS"QWeakPointer<int>',value='',numchild='3'},"
"{iname='local.compositePtr',name='compositePtr'," "{iname='local.compositePtr',name='compositePtr',"
"type='"NS"QSharedPointer<"NS"QString>',value='<null>',numchild='0'}," "type='"NS"QSharedPointer<"NS"QString>',value='(null)',numchild='0'},"
"{iname='local.compositePtr2',name='compositePtr2'," "{iname='local.compositePtr2',name='compositePtr2',"
"type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'}," "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
"{iname='local.compositePtr3',name='compositePtr3'," "{iname='local.compositePtr3',name='compositePtr3',"
...@@ -2629,7 +2631,7 @@ void tst_Gdb::dump_QSharedPointer() ...@@ -2629,7 +2631,7 @@ void tst_Gdb::dump_QSharedPointer()
"type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3'}"); "type='"NS"QWeakPointer<"NS"QString>',value='',numchild='3'}");
run("C","{iname='local.simplePtr',name='simplePtr'," run("C","{iname='local.simplePtr',name='simplePtr',"
"type='"NS"QSharedPointer<int>',value='<null>',numchild='0'}," "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.simplePtr2',name='simplePtr2'," "{iname='local.simplePtr2',name='simplePtr2',"
"type='"NS"QSharedPointer<int>',value='',numchild='3',children=[" "type='"NS"QSharedPointer<int>',value='',numchild='3',children=["
"{name='data',type='int',value='99',numchild='0'}," "{name='data',type='int',value='99',numchild='0'},"
...@@ -2646,7 +2648,7 @@ void tst_Gdb::dump_QSharedPointer() ...@@ -2646,7 +2648,7 @@ void tst_Gdb::dump_QSharedPointer()
"{name='weakref',value='3',type='int',numchild='0'}," "{name='weakref',value='3',type='int',numchild='0'},"
"{name='strongref',value='2',type='int',numchild='0'}]}," "{name='strongref',value='2',type='int',numchild='0'}]},"
"{iname='local.compositePtr',name='compositePtr'," "{iname='local.compositePtr',name='compositePtr',"
"type='"NS"QSharedPointer<"NS"QString>',value='<null>',numchild='0'}," "type='"NS"QSharedPointer<"NS"QString>',value='(null)',numchild='0'},"
"{iname='local.compositePtr2',name='compositePtr2'," "{iname='local.compositePtr2',name='compositePtr2',"
"type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'}," "type='"NS"QSharedPointer<"NS"QString>',value='',numchild='3'},"
"{iname='local.compositePtr3',name='compositePtr3'," "{iname='local.compositePtr3',name='compositePtr3',"
...@@ -2929,7 +2931,7 @@ void tst_Gdb::dump_QVariant() ...@@ -2929,7 +2931,7 @@ void tst_Gdb::dump_QVariant()
if (checkUninitialized) /*<invalid>*/ if (checkUninitialized) /*<invalid>*/
run("A","{"PRE"'value=<invalid>',numchild='0'}"); run("A","{"PRE"'value=<invalid>',numchild='0'}");
next(); next();
run("<invalid>", "{"PRE"value='<invalid>',numchild='0'}"); run("<invalid>", "{"PRE"value='(invalid)',numchild='0'}");
next(); next();
run("QBitArray", "{"PRE"value='("NS"QBitArray)',numchild='1',children=[" run("QBitArray", "{"PRE"value='("NS"QBitArray)',numchild='1',children=["
"{name='data',type='"NS"QBitArray',value='{...}',numchild='1'}]}", "{name='data',type='"NS"QBitArray',value='{...}',numchild='1'}]}",
...@@ -3114,9 +3116,9 @@ void tst_Gdb::dump_QWeakPointer_11() ...@@ -3114,9 +3116,9 @@ void tst_Gdb::dump_QWeakPointer_11()
"type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'}"); "type='"NS"QWeakPointer<int>',value='<invalid>',numchild='0'}");
next(2); next(2);
run("B","{iname='local.sp',name='sp'," run("B","{iname='local.sp',name='sp',"
"type='"NS"QSharedPointer<int>',value='<null>',numchild='0'}," "type='"NS"QSharedPointer<int>',value='(null)',numchild='0'},"
"{iname='local.wp',name='wp'," "{iname='local.wp',name='wp',"
"type='"NS"QWeakPointer<int>',value='<null>',numchild='0'}"); "type='"NS"QWeakPointer<int>',value='(null)',numchild='0'}");
} }
...@@ -3589,7 +3591,7 @@ void tst_Gdb::dump_std_vector() ...@@ -3589,7 +3591,7 @@ void tst_Gdb::dump_std_vector()
"{type='" + listType + "',value='<1 items>'," "{type='" + listType + "',value='<1 items>',"
"childtype='int'," "childtype='int',"
"childnumchild='0',children=[{value='45'}]}," "childnumchild='0',children=[{value='45'}]},"
"{value='<null>',numchild='0'}]}," "{value='(null)',numchild='0'}]},"
"{iname='local.list',name='list',type='" + listType + "'," "{iname='local.list',name='list',type='" + listType + "',"
"value='<1 items>',numchild='1'}", "value='<1 items>',numchild='1'}",
"local.vector,local.vector.0"); "local.vector,local.vector.0");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment