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

Dumpers: Fix tests execution on Windows/MinGW

Browse Source 
Change-Id: Ie6207f5edba865e880249d6f70daf1e9c72c4163
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2017-09-17 17:16:46 +03:00
committed by Orgad Shaneh
parent 6f1a18cc37
commit 119fc885be
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1014,7 +1014,7 @@ void tst_Dumpers::initTestCase()
if (base.startsWith("lldb")) if (base.startsWith("lldb"))
m_debuggerEngine = LldbEngine; m_debuggerEngine = LldbEngine;
m_qmakeBinary = QString::fromLocal8Bit(qgetenv("QTC_QMAKE_PATH_FOR_TEST")); m_qmakeBinary = QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv("QTC_QMAKE_PATH_FOR_TEST")));
if (m_qmakeBinary.isEmpty()) if (m_qmakeBinary.isEmpty())
m_qmakeBinary = "qmake"; m_qmakeBinary = "qmake";
qDebug() << "QMake : " << m_qmakeBinary; qDebug() << "QMake : " << m_qmakeBinary;
@@ -1049,18 +1049,19 @@ void tst_Dumpers::initTestCase()
version = version.mid(pos1, pos2 - pos1); version = version.mid(pos1, pos2 - pos1);
extractGdbVersion(version, &m_debuggerVersion, extractGdbVersion(version, &m_debuggerVersion,
&m_gdbBuildVersion, &m_isMacGdb, &m_isQnxGdb); &m_gdbBuildVersion, &m_isMacGdb, &m_isQnxGdb);
m_env = QProcessEnvironment::systemEnvironment(); m_makeBinary = QDir::fromNativeSeparators(QString::fromLocal8Bit(qgetenv("QTC_MAKE_PATH_FOR_TEST")));
m_makeBinary = QString::fromLocal8Bit(qgetenv("QTC_MAKE_PATH_FOR_TEST"));
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
Utils::Environment env = Utils::Environment::systemEnvironment();
if (m_makeBinary.isEmpty()) if (m_makeBinary.isEmpty())
m_makeBinary = "mingw32-make"; m_makeBinary = "mingw32-make";
if (m_makeBinary != "mingw32-make")
env.prependOrSetPath(QDir::toNativeSeparators(QFileInfo(m_makeBinary).absolutePath()));
// if qmake is not in PATH make sure the correct libs for inferior are prepended to PATH // if qmake is not in PATH make sure the correct libs for inferior are prepended to PATH
if (m_qmakeBinary != "qmake") { if (m_qmakeBinary != "qmake")
Utils::Environment env = Utils::Environment::systemEnvironment();
env.prependOrSetPath(QDir::toNativeSeparators(QFileInfo(m_qmakeBinary).absolutePath())); env.prependOrSetPath(QDir::toNativeSeparators(QFileInfo(m_qmakeBinary).absolutePath()));
m_env = env.toProcessEnvironment(); m_env = env.toProcessEnvironment();
}
#else #else
m_env = QProcessEnvironment::systemEnvironment();
if (m_makeBinary.isEmpty()) if (m_makeBinary.isEmpty())
m_makeBinary = "make"; m_makeBinary = "make";
#endif #endif
@@ -1287,9 +1288,11 @@ void tst_Dumpers::dumper()
QFile source(t->buildPath + '/' + data.mainFile); QFile source(t->buildPath + '/' + data.mainFile);
QVERIFY(source.open(QIODevice::ReadWrite)); QVERIFY(source.open(QIODevice::ReadWrite));
QString fullCode = QString() + QString fullCode = QString() +
"\n\n#if defined(_MSC_VER)" + (data.useQt ? "\n\n#ifdef _WIN32" + (data.useQt ?
"\n#include <qt_windows.h>" : "\n#include <qt_windows.h>" :
"\n#define NOMINMAX\n#include <Windows.h>") + "\n#define NOMINMAX\n#include <windows.h>") +
"\n#endif"
"\n#if defined(_MSC_VER)"
"\nvoid qtcDebugBreakFunction() { return; }" "\nvoid qtcDebugBreakFunction() { return; }"
"\n#define BREAK qtcDebugBreakFunction();" "\n#define BREAK qtcDebugBreakFunction();"
"\n\nvoid unused(const void *first,...) { (void) first; }" "\n\nvoid unused(const void *first,...) { (void) first; }"