From 5c74b361a378477790948bee48f73877ed1e8a33 Mon Sep 17 00:00:00 2001 From: "Naklicki, Mateusz" Date: Thu, 17 Jul 2025 19:14:41 +0000 Subject: [PATCH] test: prevent test cross-contamination in ClCache tests Environment flags set in GivenIgcEnvVarSetWhenGetDefaultCacheConfigThenWarningIsPrinted were leaking to other tests, causing them to fail in some scenarios. Resolves: NEO-15578 Signed-off-by: Naklicki, Mateusz --- .../windows/default_cl_cache_config_tests.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/test/unit_test/compiler_interface/windows/default_cl_cache_config_tests.cpp b/shared/test/unit_test/compiler_interface/windows/default_cl_cache_config_tests.cpp index 83e240a9e6..e906bb8733 100644 --- a/shared/test/unit_test/compiler_interface/windows/default_cl_cache_config_tests.cpp +++ b/shared/test/unit_test/compiler_interface/windows/default_cl_cache_config_tests.cpp @@ -301,7 +301,7 @@ TEST_F(ClCacheDefaultConfigWindowsTest, GivenIgcEnvVarSetOrUnsetThenCacheConfigI DWORD getFileAttributesResultMock = FILE_ATTRIBUTE_DIRECTORY; VariableBackup pathExistsMockBackup(&SysCalls::getFileAttributesResult, getFileAttributesResultMock); wchar_t envBlockNoIgc[] = L"NEO_CACHE_PERSISTENT=1\0NEO_CACHE_MAX_SIZE=22\0NEO_CACHE_DIR=ult\\directory\\\0\0"; - SysCalls::mockEnvStringsW = envBlockNoIgc; + VariableBackup mockEnvStringsWBackup(&SysCalls::mockEnvStringsW, envBlockNoIgc); auto cacheConfig = getDefaultCompilerCacheConfig(); @@ -332,7 +332,7 @@ TEST_F(ClCacheDefaultConfigWindowsTest, GivenIgcEnvVarSetWhenGetDefaultCacheConf VariableBackup pathExistsMockBackup(&SysCalls::getFileAttributesResult, getFileAttributesResultMock); wchar_t envBlockWithIgc[] = L"IGC_DEBUG=1\0NEO_CACHE_PERSISTENT=1\0NEO_CACHE_MAX_SIZE=22\0NEO_CACHE_DIR=ult\\directory\\\0\0"; - SysCalls::mockEnvStringsW = envBlockWithIgc; + VariableBackup mockEnvStringsWBackup(&SysCalls::mockEnvStringsW, envBlockWithIgc); StreamCapture capture; capture.captureStdout();