intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-19 06:24:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

test: don't load igsc in unit tests

Browse Source 
Fixes test timeouts caused by previous changes to dlopen mock

Signed-off-by: Oskar Hubert Weber <oskar.hubert.weber@intel.com>
This commit is contained in:
Oskar Hubert Weber
2024-10-16 20:51:20 +00:00
committed by Compute-Runtime-Automation
parent e495b2238a
commit 6730011c3b
3 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
level_zero/sysman/test/unit_tests/sources/firmware_util/linux/test_fw_util_linux.cpp
View File

@@ -13,30 +13,24 @@
#include <dlfcn.h>
extern void *(*dlopenFunc)(const char *filename, int flags);
namespace NEO {
namespace SysCalls {
extern int dlOpenFlags;
extern bool dlOpenCalled;
} // namespace SysCalls
} // namespace NEO
namespace L0 {
namespace Sysman {
namespace ult {
static int dlOpenFlags = 0;
static bool dlOpenCalled = false;
void *mockDlopen(const char *filename, int flags) {
dlOpenCalled = true;
dlOpenFlags = flags;
return nullptr;
}
TEST(FwUtilTest, GivenLibraryWasSetWhenCreatingFirmwareUtilInterfaceThenLibraryIsLoadedWithDeepbindDisabled) {
VariableBackup<decltype(dlopenFunc)> dlopenFuncBackup(&dlopenFunc, nullptr);
dlopenFunc = mockDlopen;
VariableBackup<bool> dlOpenCalledBackup{&dlOpenCalled, false};
VariableBackup<int> dlOpenFlagsBackup{&dlOpenFlags, 0};
VariableBackup<bool> dlOpenCalledBackup{&NEO::SysCalls::dlOpenCalled, false};
VariableBackup<int> dlOpenFlagsBackup{&NEO::SysCalls::dlOpenFlags, 0};
L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
EXPECT_EQ(dlOpenCalled, true);
EXPECT_EQ(dlOpenFlags, RTLD_LAZY);
EXPECT_EQ(NEO::SysCalls::dlOpenCalled, true);
EXPECT_EQ(NEO::SysCalls::dlOpenFlags, RTLD_LAZY);
EXPECT_EQ(pFwUtil, nullptr);
}

26
level_zero/tools/test/unit_tests/sources/sysman/firmware_util/linux/test_fw_util_linux.cpp
View File

@@ -13,30 +13,24 @@
#include <dlfcn.h>
extern void *(*dlopenFunc)(const char *filename, int flags);
namespace NEO {
namespace SysCalls {
extern int dlOpenFlags;
extern bool dlOpenCalled;
} // namespace SysCalls
} // namespace NEO
namespace L0 {
namespace Sysman {
namespace ult {
static int dlOpenFlags = 0;
static bool dlOpenCalled = false;
void *mockDlopen(const char *filename, int flags) {
dlOpenCalled = true;
dlOpenFlags = flags;
return nullptr;
}
TEST(FwUtilTest, GivenLibraryWasSetWhenCreatingFirmwareUtilInterfaceThenLibraryIsLoadedWithDeepbindDisabled) {
VariableBackup<decltype(dlopenFunc)> dlopenFuncBackup(&dlopenFunc, nullptr);
dlopenFunc = mockDlopen;
VariableBackup<bool> dlOpenCalledBackup{&dlOpenCalled, false};
VariableBackup<int> dlOpenFlagsBackup{&dlOpenFlags, 0};
VariableBackup<bool> dlOpenCalledBackup{&NEO::SysCalls::dlOpenCalled, false};
VariableBackup<int> dlOpenFlagsBackup{&NEO::SysCalls::dlOpenFlags, 0};
L0::Sysman::FirmwareUtil *pFwUtil = L0::Sysman::FirmwareUtil::create(0, 0, 0, 0);
EXPECT_EQ(dlOpenCalled, true);
EXPECT_EQ(dlOpenFlags, RTLD_LAZY);
EXPECT_EQ(NEO::SysCalls::dlOpenCalled, true);
EXPECT_EQ(NEO::SysCalls::dlOpenFlags, RTLD_LAZY);
EXPECT_EQ(pFwUtil, nullptr);
}

3
shared/test/common/mocks/linux/mock_dlopen.cpp
View File

@@ -26,8 +26,7 @@ void *dlopen(const char *filename, int flags) {
dlopenError = -1;
if (filename == nullptr ||
(strcmp(filename, "libtest_dynamic_lib.so") == 0) ||
(strcmp(filename, "libtest_l0_loader_lib.so") == 0) ||
(strcmp(filename, "libigsc.so.0") == 0)) {
(strcmp(filename, "libtest_l0_loader_lib.so") == 0)) {
return dlopenFunc(filename, flags);
}
if (filename[0] == '_') {