Commit b1af7f2f authored by Friedemann Kleint's avatar Friedemann Kleint
Browse files

Debugger autotests: Compile Windows/gcc 4.4.1, skip tst_gdb

when not applicable.
parent 30a796d4
......@@ -392,7 +392,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
extraInt0, extraInt1, extraInt2, extraInt3);
QString expected(expected0);
char buf[100];
sprintf(buf, pointerPrintFormat(), (uintptr_t)data);
sprintf(buf, pointerPrintFormat(), (quintptr)data);
if ((!expected.startsWith('t') && !expected.startsWith('f'))
|| expected.startsWith("type"))
expected = "tiname='$I',addr='$A'," + expected;
......@@ -422,7 +422,7 @@ static void testDumper(QByteArray expected0, const void *data, QByteArray outert
QByteArray str(const void *p)
{
char buf[100];
sprintf(buf, pointerPrintFormat(), (uintptr_t)p);
sprintf(buf, pointerPrintFormat(), (quintptr)p);
return buf;
}
......@@ -1552,6 +1552,7 @@ template <typename K, typename V>
void tst_Debugger::dumpQMap()
{
qDebug() << "QMap<int, int>";
// Case 1: Simple type -> simple type.
QMap<int, int> map1;
......@@ -1567,6 +1568,7 @@ void tst_Debugger::dumpQMap()
dumpQMapHelper(map1);
// Case 2: Simple type -> composite type.
qDebug() << "QMap<int, QString>";
QMap<int, QString> map2;
// Case 2.1: Empty Map.
......@@ -1581,6 +1583,7 @@ void tst_Debugger::dumpQMap()
dumpQMapHelper(map2);
// Case 3: Composite type -> simple type.
qDebug() << "QMap<QString, int>";
QMap<QString, int> map3;
// Case 3.1: Empty map.
......
......@@ -3,11 +3,12 @@
bool checkUninitialized = false;
//#define DO_DEBUG 1
#include "gdb/gdbmi.h"
#include <QtCore/QThread>
#include <QtCore/QMutex>
#include <QtCore/QWaitCondition>
/*
#include <QtGui/QBitmap>
#include <QtGui/QBrush>
......@@ -23,8 +24,9 @@ bool checkUninitialized = false;
#include <QtTest/QtTest>
#include "gdb/gdbmi.h"
#ifdef Q_OS_WIN
# include <windows.h>
#endif
#undef NS
#ifdef QT_NAMESPACE
......@@ -593,6 +595,9 @@ tst_Gdb::tst_Gdb()
void tst_Gdb::initTestCase()
{
#ifndef Q_CC_GNU
QSKIP("gdb test not applicable for compiler", SkipAll);
#endif
//qDebug() << "\nTHREAD RUN" << getpid() << gettid();
QProcess *gdbProc = new QProcess;
QStringList args;
......
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