Skip to content

Commit f77a21f

Browse files
committed
Enable umfIpcTest for Os provider with jemalloc and scalable pools
1 parent d10b8a8 commit f77a21f

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ if(LINUX AND (NOT UMF_DISABLE_HWLOC)) # OS-specific functions are implemented
224224
add_umf_test(
225225
NAME provider_os_memory
226226
SRCS provider_os_memory.cpp
227-
LIBS ${UMF_UTILS_FOR_TEST})
227+
LIBS ${UMF_UTILS_FOR_TEST} ${LIB_JEMALLOC_POOL})
228228
if(UMF_BUILD_LIBUMF_POOL_DISJOINT)
229229
target_compile_definitions(umf_test-provider_os_memory
230230
PRIVATE UMF_POOL_DISJOINT_ENABLED=1)

test/provider_os_memory.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
#include <umf/memory_provider.h>
1212
#include <umf/pools/pool_disjoint.h>
1313
#include <umf/providers/provider_os_memory.h>
14+
#ifdef UMF_POOL_JEMALLOC_ENABLED
15+
#include <umf/pools/pool_jemalloc.h>
16+
#endif
17+
#ifdef UMF_POOL_SCALABLE_ENABLED
18+
#include <umf/pools/pool_scalable.h>
19+
#endif
1420

1521
using umf_test::test;
1622

@@ -389,6 +395,14 @@ static std::vector<ipcTestParams> ipcTestParamsList = {
389395
{umfDisjointPoolOps(), &disjointParams, umfOsMemoryProviderOps(),
390396
&os_params, &hostAccessor, false},
391397
#endif
398+
#ifdef UMF_POOL_JEMALLOC_ENABLED
399+
{umfJemallocPoolOps(), nullptr, umfOsMemoryProviderOps(), &os_params,
400+
&hostAccessor, false},
401+
#endif
402+
#ifdef UMF_POOL_SCALABLE_ENABLED
403+
{umfScalablePoolOps(), nullptr, umfOsMemoryProviderOps(), &os_params,
404+
&hostAccessor, false},
405+
#endif
392406
};
393407

394408
INSTANTIATE_TEST_SUITE_P(osProviderTest, umfIpcTest,

0 commit comments

Comments
 (0)