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

Debugger: Adjust auto test runner to manual testing needs

Browse Source 
- Don't remove temp stuff when QTC_KEEP_TEMP_FOR_TEST is set, even
  if the test passes.
- Heed QTC_USE_GLIBCXXDEBUG_FOR_TEST to enforce compilation with
  -D_GLIBCXX_DEBUG to trigger a way to test the full-debug version
  of g++'s standard library

Change-Id: I5bf9f423835883349af3ce772e900e0a2123c69e
Reviewed-by: David Schulz <david.schulz@digia.com>
This commit is contained in:
hjk
2013-08-16 13:43:42 +02:00
parent 274bea7862
commit 8c12b2bf73
1 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -414,7 +414,8 @@ struct DataBase
{ {
DataBase() DataBase()
: useQt(false), useQHash(false), : useQt(false), useQHash(false),
forceC(false), gdbOnly(false), lldbOnly(false) forceC(false), gdbOnly(false), lldbOnly(false),
glibcxxDebug(false)
{} {}
mutable bool useQt; mutable bool useQt;
@@ -422,6 +423,7 @@ struct DataBase
mutable bool forceC; mutable bool forceC;
mutable bool gdbOnly; mutable bool gdbOnly;
mutable bool lldbOnly; mutable bool lldbOnly;
mutable bool glibcxxDebug;
mutable GdbVersion neededGdbVersion; mutable GdbVersion neededGdbVersion;
mutable LldbVersion neededLldbVersion; mutable LldbVersion neededLldbVersion;
}; };
@@ -551,11 +553,13 @@ public:
{ {
t = 0; t = 0;
m_keepTemp = true; m_keepTemp = true;
m_forceKeepTemp = false;
m_gdbVersion = 0; m_gdbVersion = 0;
m_gdbBuildVersion = 0; m_gdbBuildVersion = 0;
m_lldbVersion = 0; m_lldbVersion = 0;
m_isMacGdb = false; m_isMacGdb = false;
m_isQnxGdb = false; m_isQnxGdb = false;
m_useGLibCxxDebug = false;
} }
private slots: private slots:
@@ -566,6 +570,7 @@ private slots:
void cleanup(); void cleanup();
private: private:
bool keepTemp() const { return m_keepTemp || m_forceKeepTemp; }
TempStuff *t; TempStuff *t;
QByteArray m_debuggerBinary; QByteArray m_debuggerBinary;
QByteArray m_qmakeBinary; QByteArray m_qmakeBinary;
@@ -573,11 +578,13 @@ private:
bool m_usePython; bool m_usePython;
DebuggerEngine m_debuggerEngine; DebuggerEngine m_debuggerEngine;
bool m_keepTemp; bool m_keepTemp;
bool m_forceKeepTemp;
int m_gdbVersion; // 7.5.1 -> 70501 int m_gdbVersion; // 7.5.1 -> 70501
int m_gdbBuildVersion; int m_gdbBuildVersion;
int m_lldbVersion; int m_lldbVersion;
bool m_isMacGdb; bool m_isMacGdb;
bool m_isQnxGdb; bool m_isQnxGdb;
bool m_useGLibCxxDebug;
}; };
void tst_Dumpers::initTestCase() void tst_Dumpers::initTestCase()
@@ -599,6 +606,12 @@ void tst_Dumpers::initTestCase()
m_qmakeBinary = "qmake"; m_qmakeBinary = "qmake";
qDebug() << "QMake : " << m_qmakeBinary.constData(); qDebug() << "QMake : " << m_qmakeBinary.constData();
m_useGLibCxxDebug = qgetenv("QTC_USE_GLIBCXXDEBUG_FOR_TEST").toInt();
qDebug() << "Use _GLIBCXX_DEBUG : " << m_useGLibCxxDebug;
m_forceKeepTemp = qgetenv("QTC_KEEP_TEMP_FOR_TEST").toInt();
qDebug() << "Force keep temp : " << m_forceKeepTemp;
Environment utilsEnv = Environment::systemEnvironment(); Environment utilsEnv = Environment::systemEnvironment();
if (m_debuggerEngine == DumpTestGdbEngine) { if (m_debuggerEngine == DumpTestGdbEngine) {
@@ -654,7 +667,7 @@ void tst_Dumpers::initTestCase()
if (pos >= 0) if (pos >= 0)
ba = ba.left(pos); ba = ba.left(pos);
m_lldbVersion = ba.toInt(); m_lldbVersion = ba.toInt();
qDebug() << "Lldb version " << output << ba << m_lldbVersion; qDebug() << "Lldb version :" << output << ba << m_lldbVersion;
QVERIFY(m_lldbVersion); QVERIFY(m_lldbVersion);
} }
m_env = utilsEnv.toProcessEnvironment(); m_env = utilsEnv.toProcessEnvironment();
@@ -721,6 +734,8 @@ void tst_Dumpers::dumper()
proFile.write("QT -= widgets gui\n"); proFile.write("QT -= widgets gui\n");
else else
proFile.write("CONFIG -= QT\n"); proFile.write("CONFIG -= QT\n");
if (m_useGLibCxxDebug)
proFile.write("DEFINES += _GLIBCXX_DEBUG\n");
proFile.write(data.profileExtra); proFile.write(data.profileExtra);
proFile.close(); proFile.close();
@@ -884,7 +899,7 @@ void tst_Dumpers::dumper()
error = debugger.readAllStandardError(); error = debugger.readAllStandardError();
if (!error.isEmpty()) { qDebug() << error; } if (!error.isEmpty()) { qDebug() << error; }
if (m_keepTemp) { if (keepTemp()) {
QFile logger(t->buildPath + QLatin1String("/output.txt")); QFile logger(t->buildPath + QLatin1String("/output.txt"));
logger.open(QIODevice::ReadWrite); logger.open(QIODevice::ReadWrite);
logger.write("=== STDOUT ===\n"); logger.write("=== STDOUT ===\n");
@@ -1003,14 +1018,16 @@ void tst_Dumpers::dumper()
qDebug() << "EXPANDED : " << expanded; qDebug() << "EXPANDED : " << expanded;
ok = false; ok = false;
} }
if (!ok) { if (ok) {
m_keepTemp = false;
} else {
qDebug() << "CONTENTS : " << contents; qDebug() << "CONTENTS : " << contents;
qDebug() << "Qt VERSION : " qDebug() << "Qt VERSION : "
<< qPrintable(QString::number(context.qtVersion, 16)); << qPrintable(QString::number(context.qtVersion, 16));
qDebug() << "BUILD DIR : " << qPrintable(t->buildPath); qDebug() << "BUILD DIR : " << qPrintable(t->buildPath);
} }
QVERIFY(ok); QVERIFY(ok);
t->buildTemp.setAutoRemove(m_keepTemp); t->buildTemp.setAutoRemove(!keepTemp());
} }
void tst_Dumpers::dumper_data() void tst_Dumpers::dumper_data()