Skip to content

Commit 79b5050

Browse files
lukaszstolarczuklukaszstolarczuk
committed
[CMake] Add extra info in .cmake-format for 'build_umf_test'
it's for proper parsing of CMake files.
1 parent 706c6d1 commit 79b5050

File tree

2 files changed

+64
-105
lines changed

2 files changed

+64
-105
lines changed

‎.cmake-format‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@ with section("parse"):
99
"pargs": 0,
1010
"flags": [],
1111
'kwargs': {
12-
'NAME': '*',
13-
'SRCS': '*',
14-
'LIBS': '*' ,
12+
'NAME': '*',
13+
'SRCS': '*',
14+
'LIBS': '*' ,
1515
'LIBDIRS': '*'}},
1616
'add_umf_executable': {
1717
"pargs": 0,
1818
"flags": [],
1919
'kwargs': {
20-
'NAME': '*',
21-
'SRCS': '*',
20+
'NAME': '*',
21+
'SRCS': '*',
2222
'LIBS': '*'}},
2323
'add_umf_test': {
2424
"pargs": 0,
2525
"flags": [],
2626
'kwargs': {
27-
'NAME': '*',
28-
'SRCS': '*',
27+
'NAME': '*',
28+
'SRCS': '*',
2929
'LIBS': '*'}},
3030
'add_umf_library': {
3131
"pargs": 0,
3232
"flags": [],
3333
'kwargs': {
34-
'NAME': '*',
35-
'TYPE': '*',
36-
'SRCS': '*',
34+
'NAME': '*',
35+
'TYPE': '*',
36+
'SRCS': '*',
3737
'LIBS': '*',
3838
'LINUX_MAP_FILE': '*',
3939
'WINDOWS_DEF_FILE': '*'}},
@@ -43,6 +43,13 @@ with section("parse"):
4343
'kwargs': {
4444
'LABELS': '*',
4545
'PASS_REGULAR_EXPRESSION': '*'}},
46+
'build_umf_test': {
47+
"pargs": 0,
48+
"flags": [],
49+
'kwargs': {
50+
'NAME': '*',
51+
'SRCS': '*',
52+
'LIBS': '*' }},
4653
}
4754

4855
# Override configurations per-command where available

‎test/CMakeLists.txt‎

Lines changed: 47 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ set(UMF_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR})
3131
set(UMF_UTILS_DIR ${UMF_CMAKE_SOURCE_DIR}/src/utils)
3232

3333
function(build_umf_test)
34-
# Parameters: * NAME - a name of the test * SRCS - source files * LIBS -
35-
# libraries to be linked with
34+
# Parameters:
35+
#
36+
# * NAME - a name of the test
37+
# * SRCS - source files
38+
# * LIBS - libraries to be linked with
3639
set(oneValueArgs NAME)
3740
set(multiValueArgs SRCS LIBS)
3841
cmake_parse_arguments(
@@ -120,12 +123,9 @@ function(add_umf_test)
120123
${ARGN})
121124

122125
build_umf_test(
123-
NAME
124-
${ARG_NAME}
125-
SRCS
126-
${ARG_SRCS}
127-
LIBS
128-
${ARG_LIBS})
126+
NAME ${ARG_NAME}
127+
SRCS ${ARG_SRCS}
128+
LIBS ${ARG_LIBS})
129129

130130
set(TEST_NAME umf-${ARG_NAME})
131131
set(TEST_TARGET_NAME umf_test-${ARG_NAME})
@@ -526,64 +526,42 @@ endfunction()
526526
if(LINUX)
527527
if(NOT UMF_DISABLE_HWLOC AND UMF_POOL_SCALABLE_ENABLED)
528528
build_umf_test(
529-
NAME
530-
ipc_os_prov_consumer
531-
SRCS
532-
ipc_os_prov_consumer.c
533-
common/ipc_common.c
534-
common/ipc_os_prov_common.c)
529+
NAME ipc_os_prov_consumer
530+
SRCS ipc_os_prov_consumer.c common/ipc_common.c
531+
common/ipc_os_prov_common.c)
535532
build_umf_test(
536-
NAME
537-
ipc_os_prov_producer
538-
SRCS
539-
ipc_os_prov_producer.c
540-
common/ipc_common.c
541-
common/ipc_os_prov_common.c)
533+
NAME ipc_os_prov_producer
534+
SRCS ipc_os_prov_producer.c common/ipc_common.c
535+
common/ipc_os_prov_common.c)
542536
add_umf_ipc_test(TEST ipc_os_prov_anon_fd)
543537
add_umf_ipc_test(TEST ipc_os_prov_shm)
544538

545539
if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
546540
build_umf_test(
547-
NAME
548-
ipc_os_prov_proxy
549-
SRCS
550-
ipc_os_prov_proxy.c
551-
common/ipc_common.c
552-
LIBS
553-
${UMF_UTILS_FOR_TEST})
541+
NAME ipc_os_prov_proxy
542+
SRCS ipc_os_prov_proxy.c common/ipc_common.c
543+
LIBS ${UMF_UTILS_FOR_TEST})
554544
add_umf_ipc_test(TEST ipc_os_prov_proxy)
555545
endif()
556546

557547
build_umf_test(
558-
NAME
559-
ipc_devdax_prov_consumer
560-
SRCS
561-
ipc_devdax_prov_consumer.c
562-
common/ipc_common.c
563-
common/ipc_os_prov_common.c)
548+
NAME ipc_devdax_prov_consumer
549+
SRCS ipc_devdax_prov_consumer.c common/ipc_common.c
550+
common/ipc_os_prov_common.c)
564551
build_umf_test(
565-
NAME
566-
ipc_devdax_prov_producer
567-
SRCS
568-
ipc_devdax_prov_producer.c
569-
common/ipc_common.c
570-
common/ipc_os_prov_common.c)
552+
NAME ipc_devdax_prov_producer
553+
SRCS ipc_devdax_prov_producer.c common/ipc_common.c
554+
common/ipc_os_prov_common.c)
571555
add_umf_ipc_test(TEST ipc_devdax_prov)
572556

573557
build_umf_test(
574-
NAME
575-
ipc_file_prov_consumer
576-
SRCS
577-
ipc_file_prov_consumer.c
578-
common/ipc_common.c
579-
common/ipc_os_prov_common.c)
558+
NAME ipc_file_prov_consumer
559+
SRCS ipc_file_prov_consumer.c common/ipc_common.c
560+
common/ipc_os_prov_common.c)
580561
build_umf_test(
581-
NAME
582-
ipc_file_prov_producer
583-
SRCS
584-
ipc_file_prov_producer.c
585-
common/ipc_common.c
586-
common/ipc_os_prov_common.c)
562+
NAME ipc_file_prov_producer
563+
SRCS ipc_file_prov_producer.c common/ipc_common.c
564+
common/ipc_os_prov_common.c)
587565
add_umf_ipc_test(TEST ipc_file_prov)
588566
add_umf_ipc_test(TEST ipc_file_prov_fsdax)
589567
endif()
@@ -594,59 +572,33 @@ if(LINUX)
594572
AND UMF_BUILD_LEVEL_ZERO_PROVIDER
595573
AND UMF_BUILD_LIBUMF_POOL_DISJOINT)
596574
build_umf_test(
597-
NAME
598-
ipc_level_zero_prov_consumer
599-
SRCS
600-
providers/ipc_level_zero_prov_consumer.c
601-
common/ipc_common.c
602-
providers/ipc_level_zero_prov_common.c
603-
${UMF_UTILS_DIR}/utils_level_zero.cpp
604-
LIBS
605-
ze_loader
606-
disjoint_pool
607-
${UMF_UTILS_FOR_TEST})
575+
NAME ipc_level_zero_prov_consumer
576+
SRCS providers/ipc_level_zero_prov_consumer.c common/ipc_common.c
577+
providers/ipc_level_zero_prov_common.c
578+
${UMF_UTILS_DIR}/utils_level_zero.cpp
579+
LIBS ze_loader disjoint_pool ${UMF_UTILS_FOR_TEST})
608580
build_umf_test(
609-
NAME
610-
ipc_level_zero_prov_producer
611-
SRCS
612-
providers/ipc_level_zero_prov_producer.c
613-
common/ipc_common.c
614-
providers/ipc_level_zero_prov_common.c
615-
${UMF_UTILS_DIR}/utils_level_zero.cpp
616-
LIBS
617-
ze_loader
618-
disjoint_pool
619-
${UMF_UTILS_FOR_TEST})
581+
NAME ipc_level_zero_prov_producer
582+
SRCS providers/ipc_level_zero_prov_producer.c common/ipc_common.c
583+
providers/ipc_level_zero_prov_common.c
584+
${UMF_UTILS_DIR}/utils_level_zero.cpp
585+
LIBS ze_loader disjoint_pool ${UMF_UTILS_FOR_TEST})
620586
add_umf_ipc_test(TEST ipc_level_zero_prov SRC_DIR providers)
621587
endif()
622588

623589
if(UMF_BUILD_GPU_TESTS
624590
AND UMF_BUILD_CUDA_PROVIDER
625591
AND UMF_BUILD_LIBUMF_POOL_DISJOINT)
626592
build_umf_test(
627-
NAME
628-
ipc_cuda_prov_consumer
629-
SRCS
630-
providers/ipc_cuda_prov_consumer.c
631-
common/ipc_common.c
632-
providers/ipc_cuda_prov_common.c
633-
providers/cuda_helpers.cpp
634-
LIBS
635-
cuda
636-
disjoint_pool
637-
${UMF_UTILS_FOR_TEST})
593+
NAME ipc_cuda_prov_consumer
594+
SRCS providers/ipc_cuda_prov_consumer.c common/ipc_common.c
595+
providers/ipc_cuda_prov_common.c providers/cuda_helpers.cpp
596+
LIBS cuda disjoint_pool ${UMF_UTILS_FOR_TEST})
638597
build_umf_test(
639-
NAME
640-
ipc_cuda_prov_producer
641-
SRCS
642-
providers/ipc_cuda_prov_producer.c
643-
common/ipc_common.c
644-
providers/ipc_cuda_prov_common.c
645-
providers/cuda_helpers.cpp
646-
LIBS
647-
cuda
648-
disjoint_pool
649-
${UMF_UTILS_FOR_TEST})
598+
NAME ipc_cuda_prov_producer
599+
SRCS providers/ipc_cuda_prov_producer.c common/ipc_common.c
600+
providers/ipc_cuda_prov_common.c providers/cuda_helpers.cpp
601+
LIBS cuda disjoint_pool ${UMF_UTILS_FOR_TEST})
650602
add_umf_ipc_test(TEST ipc_cuda_prov SRC_DIR providers)
651603
endif()
652604
else()

0 commit comments

Comments
 (0)