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

DumperTests: Ensure a set up environment

Browse Source 
For whatever reasons the qmake call already needs an
environment containing cl on Windows if QC and the auto
tests have been built with cmake.

Change-Id: I7b55fb792d3bc282cc1561e8e3b55885a25bcf0e
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2021-04-14 14:33:30 +02:00
parent 9f32c4aa2e
commit 915b9d0e31
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1628,6 +1628,7 @@ void tst_Dumpers::dumper()
"." "."
}; };
//qDebug() << "Starting cmake: " << m_cmakeBinary << ' ' << qPrintable(options.join(' ')); //qDebug() << "Starting cmake: " << m_cmakeBinary << ' ' << qPrintable(options.join(' '));
cmake.setProcessEnvironment(m_env);
cmake.start(m_cmakeBinary, options); cmake.start(m_cmakeBinary, options);
QVERIFY(cmake.waitForFinished()); QVERIFY(cmake.waitForFinished());
output = cmake.readAllStandardOutput(); output = cmake.readAllStandardOutput();
@@ -1648,6 +1649,7 @@ void tst_Dumpers::dumper()
if (m_qtVersion && m_qtVersion < 0x050000) if (m_qtVersion && m_qtVersion < 0x050000)
options << "-spec" << "unsupported/macx-clang"; options << "-spec" << "unsupported/macx-clang";
#endif #endif
qmake.setProcessEnvironment(m_env);
qmake.start(m_qmakeBinary, options); qmake.start(m_qmakeBinary, options);
QVERIFY(qmake.waitForFinished()); QVERIFY(qmake.waitForFinished());
output = qmake.readAllStandardOutput(); output = qmake.readAllStandardOutput();