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

Tests: Fix setting up env for tests on Win

Browse Source 
..when testing MinGW env inside a MSVC dumper tests.
Amends 652b9844e6.

Change-Id: I259e4392078628f6ec235291ac101bad973ff70d
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-11-30 08:52:54 +01:00
parent 37e118b5ec
commit 355105b7a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1224,10 +1224,10 @@ void tst_Dumpers::initTestCase()
if (m_makeBinary.isEmpty()) if (m_makeBinary.isEmpty())
m_makeBinary = "mingw32-make"; m_makeBinary = "mingw32-make";
if (m_makeBinary != "mingw32-make") if (m_makeBinary != "mingw32-make")
env.prependOrSetPath(Utils::FilePath::fromString(m_makeBinary)); env.prependOrSetPath(Utils::FilePath::fromString(m_makeBinary).parentDir());
// 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")
env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary)); env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary).parentDir());
m_env = env.toProcessEnvironment(); m_env = env.toProcessEnvironment();
#else #else
m_env = QProcessEnvironment::systemEnvironment(); m_env = QProcessEnvironment::systemEnvironment();
@@ -1248,7 +1248,7 @@ void tst_Dumpers::initTestCase()
cdbextPath = QString(CDBEXT_PATH "\\qtcreatorcdbext64"); cdbextPath = QString(CDBEXT_PATH "\\qtcreatorcdbext64");
QVERIFY(QFile::exists(cdbextPath + "\\qtcreatorcdbext.dll")); QVERIFY(QFile::exists(cdbextPath + "\\qtcreatorcdbext.dll"));
env.set("_NT_DEBUGGER_EXTENSION_PATH", cdbextPath); env.set("_NT_DEBUGGER_EXTENSION_PATH", cdbextPath);
env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary)); env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary).parentDir());
m_makeBinary = env.searchInPath("nmake.exe").toString(); m_makeBinary = env.searchInPath("nmake.exe").toString();
m_env = env.toProcessEnvironment(); m_env = env.toProcessEnvironment();