Skip to content

Commit 7ba7f04

Browse files
PatKaminldorau
authored andcommitted
Disable proxy lib tests on Windows Debug
1 parent 22a30de commit 7ba7f04

File tree

2 files changed

+32
-12
lines changed

2 files changed

+32
-12
lines changed

.cmake-format

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ with section("parse"):
2626
'kwargs': {
2727
'NAME': '*',
2828
'SRCS': '*',
29-
'LIBS': '*'}},
29+
'LIBS': '*',
30+
'CFGS': '*',}},
3031
'add_umf_library': {
3132
"pargs": 0,
3233
"flags": [],

test/CMakeLists.txt

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function(add_umf_test)
3030
# * SRCS - source files
3131
# * LIBS - libraries to be linked with
3232
set(oneValueArgs NAME)
33-
set(multiValueArgs SRCS LIBS)
33+
set(multiValueArgs SRCS LIBS CFGS)
3434
cmake_parse_arguments(
3535
ARG
3636
""
@@ -73,6 +73,7 @@ function(add_umf_test)
7373
add_test(
7474
NAME ${TEST_NAME}
7575
COMMAND ${TEST_TARGET_NAME}
76+
CONFIGURATIONS ${ARG_CFGS}
7677
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
7778

7879
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "umf")
@@ -223,14 +224,32 @@ add_umf_test(
223224

224225
# tests for the proxy library
225226
if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
226-
add_umf_test(
227-
NAME proxy_lib_basic
228-
SRCS test_proxy_lib.cpp
229-
LIBS umf_proxy)
230-
231-
# the memoryPool test run with the proxy library
232-
add_umf_test(
233-
NAME proxy_lib_memoryPool
234-
SRCS memoryPoolAPI.cpp malloc_compliance_tests.cpp
235-
LIBS umf_proxy)
227+
# The CFGS variable can be removed when the issue of running the proxy
228+
# library on Windows with Debug configuration is fixed.
229+
if(WINDOWS)
230+
add_umf_test(
231+
NAME proxy_lib_basic
232+
SRCS test_proxy_lib.cpp
233+
LIBS umf_proxy
234+
CFGS Release RelWithDebInfo MinSizeRel)
235+
# the memoryPool test run with the proxy library
236+
add_umf_test(
237+
NAME proxy_lib_memoryPool
238+
SRCS memoryPoolAPI.cpp malloc_compliance_tests.cpp
239+
LIBS umf_proxy
240+
CFGS Release RelWithDebInfo MinSizeRel)
241+
else()
242+
add_umf_test(
243+
NAME proxy_lib_basic
244+
SRCS test_proxy_lib.cpp
245+
LIBS umf_proxy
246+
CFGS Debug Release RelWithDebInfo MinSizeRel)
247+
248+
# the memoryPool test run with the proxy library
249+
add_umf_test(
250+
NAME proxy_lib_memoryPool
251+
SRCS memoryPoolAPI.cpp malloc_compliance_tests.cpp
252+
LIBS umf_proxy
253+
CFGS Debug Release RelWithDebInfo MinSizeRel)
254+
endif()
236255
endif()

0 commit comments

Comments
 (0)