Skip to content

Commit 56d93ed

Browse files
committed
Revert "Disable proxy lib tests on Windows Debug"
This reverts commit 92fa419. Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com>
1 parent d53f123 commit 56d93ed

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

.cmake-format

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

test/CMakeLists.txt

Lines changed: 4 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 CFGS)
33+
set(multiValueArgs SRCS LIBS)
3434
cmake_parse_arguments(
3535
ARG
3636
""
@@ -73,7 +73,6 @@ function(add_umf_test)
7373
add_test(
7474
NAME ${TEST_NAME}
7575
COMMAND ${TEST_TARGET_NAME}
76-
CONFIGURATIONS ${ARG_CFGS}
7776
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
7877

7978
set_tests_properties(${TEST_NAME} PROPERTIES LABELS "umf")
@@ -224,22 +223,16 @@ add_umf_test(
224223

225224
# tests for the proxy library
226225
if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
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-
set(CONFIGS Release RelWithDebInfo MinSizeRel)
231-
endif()
232226
add_umf_test(
233227
NAME proxy_lib_basic
234228
SRCS test_proxy_lib.cpp
235-
LIBS umf_proxy
236-
CFGS ${CONFIGS})
229+
LIBS umf_proxy)
230+
237231
# the memoryPool test run with the proxy library
238232
add_umf_test(
239233
NAME proxy_lib_memoryPool
240234
SRCS memoryPoolAPI.cpp malloc_compliance_tests.cpp
241-
LIBS umf_proxy
242-
CFGS ${CONFIGS})
235+
LIBS umf_proxy)
243236
target_compile_definitions(umf_test-proxy_lib_memoryPool
244237
PUBLIC UMF_PROXY_LIB_ENABLED=1)
245238
endif()

0 commit comments

Comments
 (0)