windows next fix attempt

Author: lslusarczyk

test/common/level_zero_mocks.cpp

@@ -8,7 +8,9 @@
  */
 
 #include "level_zero_mocks.h"
+
 #include "umf/providers/provider_level_zero.h"
+#include "utils_load_library.h"
 #include <cstdlib>
 
 using namespace ::testing;
@@ -92,9 +94,22 @@ TestCreateMemoryAllocationProperties(uint32_t modifier) {
 
 void MockedLevelZeroTestEnvironment::SetUp() {
 #ifdef _WIN32
-    _putenv_s("UMF_ZE_LOADER_LIB_NAME", "umf_ze_loopback.dll");
+    const char *lib_name = "umf_ze_loopback.dll";
+    _putenv_s("UMF_ZE_LOADER_LIB_NAME", lib_name);
 #else
-    setenv("UMF_ZE_LOADER_LIB_NAME", "libumf_ze_loopback.so", 1);
+    const char *lib_name = "libumf_ze_loopback.so";
+    setenv("UMF_ZE_LOADER_LIB_NAME", lib_name, 1);
 #endif
+
+    void *lib_handle =
+        utils_open_library(lib_name, UMF_UTIL_OPEN_LIBRARY_NO_LOAD);
+    ASSERT_NE(lib_handle, nullptr);
+
+    l0interface = static_cast<LevelZero **>(
+        utils_get_symbol_addr(lib_handle, "level_zero_mock", lib_name));
+    ASSERT_NE(l0interface, nullptr);
+    ASSERT_EQ(*l0interface, nullptr);
 }
 void MockedLevelZeroTestEnvironment::TearDown() {}
+
+LevelZero **MockedLevelZeroTestEnvironment::l0interface;

test/common/level_zero_mocks.h

@@ -80,6 +80,8 @@ class LevelZeroMock : public LevelZero {
 // important, makes UMF load ze_loopback instead of regular l0
 class MockedLevelZeroTestEnvironment : public ::testing::Environment {
   public:
+    static LevelZero **l0interface;
+
     void SetUp() override;
     void TearDown() override;
 };

test/common/ze_loopback.cpp

@@ -12,6 +12,8 @@
 #include <cstdlib>
 #include <iostream>
 
+LevelZero *level_zero_mock = nullptr;
+
 static void check_mock_present() {
     if (level_zero_mock == nullptr) {
         std::cerr << "level_zero_mock was not set\n";

test/common/ze_loopback.h

@@ -30,6 +30,4 @@ class LevelZero {
     virtual ze_result_t zeMemFree(ze_context_handle_t hContext, void *ptr) = 0;
 };
 
-extern LevelZero *level_zero_mock;
-
 #endif //UMF_TEST_ZE_LOOPBACK_H

test/pools/pool_residency.cpp

@@ -11,16 +11,16 @@
 
 using namespace testing;
 
-LevelZero *level_zero_mock = nullptr;
-
 class PoolResidencyTestFixture : public Test {
   protected:
-    StrictMock<LevelZeroMock> l0mock;
     umf_memory_pool_handle_t pool = nullptr;
     const ze_device_handle_t OUR_DEVICE;
+    StrictMock<LevelZeroMock> l0mock;
 
     PoolResidencyTestFixture()
-        : OUR_DEVICE(TestCreatePointer<ze_device_handle_t>(777)) {}
+        : OUR_DEVICE(TestCreatePointer<ze_device_handle_t>(777)) {
+        *MockedLevelZeroTestEnvironment::l0interface = &l0mock;
+    }
 
     void initializeMemoryPool(umf_memory_provider_handle_t provider) {
 
@@ -34,7 +34,7 @@ class PoolResidencyTestFixture : public Test {
         umf_test::defaultDisjointPoolConfigDestroy(params);
     }
 
-    void SetUp() override { level_zero_mock = &l0mock; }
+    void SetUp() override {}
     void TearDown() override {
         if (pool != nullptr) {
             EXPECT_CALL(l0mock, zeMemFree(CONTEXT, _))

test/providers/provider_level_zero_residency.cpp

@@ -8,8 +8,6 @@
 
 #include "gtest/gtest.h"
 
-LevelZero *level_zero_mock = nullptr;
-
 using namespace testing;
 
 class LevelZeroResidencyTestFixture : public Test {
@@ -19,9 +17,11 @@ class LevelZeroResidencyTestFixture : public Test {
     const ze_device_handle_t OUR_DEVICE;
 
     LevelZeroResidencyTestFixture()
-        : OUR_DEVICE(TestCreatePointer<ze_device_handle_t>(777)) {}
+        : OUR_DEVICE(TestCreatePointer<ze_device_handle_t>(777)) {
+        *MockedLevelZeroTestEnvironment::l0interface = &l0mock;
+    }
 
-    void SetUp() override { level_zero_mock = &l0mock; }
+    void SetUp() override {}
     void TearDown() override {
         Mock::VerifyAndClearExpectations(&l0mock);
         umfMemoryProviderDestroy(provider);