From 915b9d0e314889000041fd0282c90076f7062c6e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 14 Apr 2021 14:33:30 +0200 Subject: [PATCH] DumperTests: Ensure a set up environment 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 --- tests/auto/debugger/tst_dumpers.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 8cf610bd281..861ffcc9dda 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -1628,6 +1628,7 @@ void tst_Dumpers::dumper() "." }; //qDebug() << "Starting cmake: " << m_cmakeBinary << ' ' << qPrintable(options.join(' ')); + cmake.setProcessEnvironment(m_env); cmake.start(m_cmakeBinary, options); QVERIFY(cmake.waitForFinished()); output = cmake.readAllStandardOutput(); @@ -1648,6 +1649,7 @@ void tst_Dumpers::dumper() if (m_qtVersion && m_qtVersion < 0x050000) options << "-spec" << "unsupported/macx-clang"; #endif + qmake.setProcessEnvironment(m_env); qmake.start(m_qmakeBinary, options); QVERIFY(qmake.waitForFinished()); output = qmake.readAllStandardOutput();