diff options
| author | Christian Stenger <christian.stenger@qt.io> | 2021-11-30 08:52:54 +0100 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2021-11-30 08:06:34 +0000 |
| commit | 355105b7a2c7292fda88038a1f711e741bcc4218 (patch) | |
| tree | cdcf5a48b945a4a7eb4e870d18110b07fecf68b6 /tests | |
| parent | 37e118b5ec0971531e6b7fd133011252aeaeef0c (diff) | |
Tests: Fix setting up env for tests on Win
..when testing MinGW env inside a MSVC dumper tests.
Amends 652b9844e6fab.
Change-Id: I259e4392078628f6ec235291ac101bad973ff70d
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/debugger/tst_dumpers.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 1accd1e719..b58bfbaeb0 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1224,10 +1224,10 @@ void tst_Dumpers::initTestCase() if (m_makeBinary.isEmpty()) 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 (m_qmakeBinary != "qmake") - env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary)); + env.prependOrSetPath(Utils::FilePath::fromString(m_qmakeBinary).parentDir()); m_env = env.toProcessEnvironment(); #else m_env = QProcessEnvironment::systemEnvironment(); @@ -1248,7 +1248,7 @@ void tst_Dumpers::initTestCase() cdbextPath = QString(CDBEXT_PATH "\\qtcreatorcdbext64"); QVERIFY(QFile::exists(cdbextPath + "\\qtcreatorcdbext.dll")); 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_env = env.toProcessEnvironment(); |