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

Debugger: Add environment variable for cdb extension path

Browse Source 
Change-Id: I6d7710ad3f4ba8b9dd32928c06d36191e63e9d3b
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2016-12-14 09:07:47 +01:00
parent 03963ae31d
commit 0cadb398a5
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/debugger/README.txt
View File

@@ -21,6 +21,8 @@ conditions by using environment variables as follows:
paths installed or if a non-standard path has been used
(QTC_MSVC_ENV_BAT - to set up MSVC)
(QTC_CDBEXT_PATH (optional) - path to the cdbextension
defaults to IDE_BUILD_TREE/IDE_LIBRARY_BASENAME/qtcreatorcdbext64)
The tests should be used for automated testing, but can also
be used for dumper development and fixing.

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

@@ -151,7 +151,9 @@ static void setupCdb(QString *makeBinary, QProcessEnvironment *environment)
QVERIFY(generateEnvironmentSettings(env, QString::fromLatin1(envBat), QString(), envPairs));
for (QMap<QString,QString>::const_iterator envIt = envPairs.begin(); envIt != envPairs.end(); ++envIt)
env.set(envIt.key(), envIt.value());
const QByteArray cdbextPath = CDBEXT_PATH "\\qtcreatorcdbext64";
QByteArray cdbextPath = qgetenv("QTC_CDBEXT_PATH");
if (cdbextPath.isEmpty())
cdbextPath = CDBEXT_PATH "\\qtcreatorcdbext64";
QVERIFY(QFile::exists(QString::fromLatin1(cdbextPath + QByteArray("\\qtcreatorcdbext.dll"))));
env.set(QLatin1String("_NT_DEBUGGER_EXTENSION_PATH"), QString::fromLatin1(cdbextPath));
*makeBinary = env.searchInPath(QLatin1String("nmake.exe")).toString();