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

McuSupport: Use qtc Utils::Environment helpers instead of qt globals

Browse Source 
Change-Id: I7e50c7a2417dd6cf2abf6f46a67bbc7eed6f664d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Piotr Mućko
2022-09-01 11:49:00 +02:00
parent a621aa1d8b
commit 9552658b2b
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mcusupport/test/unittest.cpp
View File

@@ -1228,7 +1228,7 @@ void McuSupportTest::test_passDirectoryVersionDetectorToRenesasBoardSdkPackage()
void McuSupportTest::test_resolveEnvironmentVariablesInDefaultPath() void McuSupportTest::test_resolveEnvironmentVariablesInDefaultPath()
{ {
QVERIFY(qputenv(QUL_ENV_VAR, qtForMcuSdkPath)); Utils::Environment::modifySystemEnvironment({{QUL_ENV_VAR, qtForMcuSdkPath}});
QCOMPARE(qtcEnvironmentVariable(QUL_ENV_VAR), qtForMcuSdkPath); QCOMPARE(qtcEnvironmentVariable(QUL_ENV_VAR), qtForMcuSdkPath);
const QString qulEnvVariable = QString("%{Env:") + QUL_ENV_VAR + "}"; const QString qulEnvVariable = QString("%{Env:") + QUL_ENV_VAR + "}";
@@ -1256,7 +1256,9 @@ void McuSupportTest::test_resolveEnvironmentVariablesInDefaultPath()
QVERIFY(toolchainFilePkg->path().toString().startsWith(qtForMcuSdkPath)); QVERIFY(toolchainFilePkg->path().toString().startsWith(qtForMcuSdkPath));
QCOMPARE(toolchainFilePkg->defaultPath().toString(), expectedPkgPath); QCOMPARE(toolchainFilePkg->defaultPath().toString(), expectedPkgPath);
QVERIFY(qunsetenv(QUL_ENV_VAR)); Utils::Environment::modifySystemEnvironment(
{{QUL_ENV_VAR, qtForMcuSdkPath, EnvironmentItem::Unset}});
QVERIFY(!qtcEnvironmentVariableIsSet(QUL_ENV_VAR));
} }
void McuSupportTest::test_resolveCmakeVariablesInDefaultPath() void McuSupportTest::test_resolveCmakeVariablesInDefaultPath()