From 047be0a313b6f13edc64d9de11526064418f6d7a Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Thu, 29 May 2025 15:49:06 +0000 Subject: [PATCH] test: Correct compiler cache fixture Signed-off-by: Filip Hazubski --- .../test/common/os_interface/windows/sys_calls.cpp | 9 +++++---- .../windows/compiler_cache_tests_windows.cpp | 14 +++++++------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/shared/test/common/os_interface/windows/sys_calls.cpp b/shared/test/common/os_interface/windows/sys_calls.cpp index 65e81be964..41be708212 100644 --- a/shared/test/common/os_interface/windows/sys_calls.cpp +++ b/shared/test/common/os_interface/windows/sys_calls.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2024 Intel Corporation + * Copyright (C) 2018-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -63,7 +63,8 @@ HANDLE createFileAResults[createFileAResultsCount] = {nullptr, nullptr, nullptr, size_t deleteFileACalled = 0u; const size_t deleteFilesCount = 4; -std::string deleteFiles[deleteFilesCount]; +constexpr size_t deleteFilesMaxLength = 256; +char deleteFiles[deleteFilesCount][deleteFilesMaxLength] = {{0}}; HRESULT shGetKnownFolderPathResult = 0; extern const size_t shGetKnownFolderSetPathSize = 50; @@ -204,7 +205,7 @@ HANDLE createFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, BOOL deleteFileA(LPCSTR lpFileName) { if (deleteFileACalled < deleteFilesCount) { - deleteFiles[deleteFileACalled] = std::string(lpFileName); + memcpy_s(deleteFiles[deleteFileACalled], deleteFilesMaxLength, lpFileName, strlen(lpFileName)); } deleteFileACalled++; return TRUE; @@ -475,4 +476,4 @@ unsigned int readEnablePreemptionRegKey() { return 1; } -} // namespace NEO \ No newline at end of file +} // namespace NEO diff --git a/shared/test/unit_test/compiler_interface/windows/compiler_cache_tests_windows.cpp b/shared/test/unit_test/compiler_interface/windows/compiler_cache_tests_windows.cpp index 66e0ef8666..93da5cc073 100644 --- a/shared/test/unit_test/compiler_interface/windows/compiler_cache_tests_windows.cpp +++ b/shared/test/unit_test/compiler_interface/windows/compiler_cache_tests_windows.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2024 Intel Corporation + * Copyright (C) 2019-2025 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -112,7 +112,7 @@ extern const size_t createFileAResultsCount; extern HANDLE createFileAResults[]; extern size_t deleteFileACalled; -extern std::string deleteFiles[]; +extern char deleteFiles[][256]; extern bool callBaseReadFile; extern BOOL readFileResult; @@ -185,7 +185,7 @@ struct CompilerCacheWindowsTest : public ::testing::Test { memset(&SysCalls::findNextFileAFileData[i], 0, sizeof(SysCalls::findNextFileAFileData[i])); } for (size_t i = 0; i < SysCalls::deleteFileACalled; i++) { - SysCalls::deleteFiles[i].~basic_string(); + memset(SysCalls::deleteFiles[i], 0, sizeof(SysCalls::deleteFiles[0])); } for (size_t i = 0; i < SysCalls::createFileAResultsCount; i++) { SysCalls::createFileAResults[i] = nullptr; @@ -248,8 +248,8 @@ TEST_F(CompilerCacheWindowsTest, GivenCompilerCacheWithOneMegabyteWhenEvictCache EXPECT_TRUE(result); EXPECT_EQ(2u, SysCalls::deleteFileACalled); - EXPECT_EQ(0, strcmp(deletedFiles[0].c_str(), "somePath\\cl_cache\\file_3.cl_cache")); - EXPECT_EQ(0, strcmp(deletedFiles[1].c_str(), "somePath\\cl_cache\\file_1.cl_cache")); + EXPECT_EQ(0, strcmp(deletedFiles[0], "somePath\\cl_cache\\file_3.cl_cache")); + EXPECT_EQ(0, strcmp(deletedFiles[1], "somePath\\cl_cache\\file_1.cl_cache")); } TEST_F(CompilerCacheWindowsTest, GivenCompilerCacheWithOneMegabyteAnd3CacheFilesAnd1DirectoryWhenEvictCacheIsCalledThenDeleteTwoOldestFilesSkippingDirectory) { @@ -283,8 +283,8 @@ TEST_F(CompilerCacheWindowsTest, GivenCompilerCacheWithOneMegabyteAnd3CacheFiles EXPECT_TRUE(result); EXPECT_EQ(2u, SysCalls::deleteFileACalled); - EXPECT_EQ(0, strcmp(deletedFiles[0].c_str(), "somePath\\cl_cache\\file_3.cl_cache")); - EXPECT_EQ(0, strcmp(deletedFiles[1].c_str(), "somePath\\cl_cache\\file_0.cl_cache")); + EXPECT_EQ(0, strcmp(deletedFiles[0], "somePath\\cl_cache\\file_3.cl_cache")); + EXPECT_EQ(0, strcmp(deletedFiles[1], "somePath\\cl_cache\\file_0.cl_cache")); } TEST_F(CompilerCacheWindowsTest, givenEvictCacheWhenFileSearchFailedThenDebugMessageWithErrorIsPrinted) {