Skip to content

Commit 079ecef

Browse files
lukaszstolarczuklukaszstolarczuk
committed
[CMake] Add extra info in .cmake-format
for 'build_umf_test' and 'add_umf_ipc_test'. It's for proper parsing of CMake files.
1 parent fac88da commit 079ecef

File tree

2 files changed

+80
-110
lines changed

2 files changed

+80
-110
lines changed

‎.cmake-format

+24-11
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,7 +43,20 @@ with section("parse"):
4343
'kwargs': {
4444
'LABELS': '*',
4545
'PASS_REGULAR_EXPRESSION': '*'}},
46-
}
46+
'build_umf_test': {
47+
"pargs": 0,
48+
"flags": [],
49+
'kwargs': {
50+
'NAME': '*',
51+
'SRCS': '*',
52+
'LIBS': '*' }},
53+
'add_umf_ipc_test': {
54+
"pargs": 0,
55+
"flags": [],
56+
'kwargs': {
57+
'TEST': '*',
58+
'SRC_DIR': '*'}},
59+
}
4760

4861
# Override configurations per-command where available
4962
override_spec = {}

‎test/CMakeLists.txt

+56-99
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(
@@ -108,8 +111,11 @@ function(build_umf_test)
108111
endfunction()
109112

110113
function(add_umf_test)
111-
# Parameters: * NAME - a name of the test * SRCS - source files * LIBS -
112-
# libraries to be linked with
114+
# Parameters:
115+
#
116+
# * NAME - a name of the test
117+
# * SRCS - source files
118+
# * LIBS - libraries to be linked with
113119
set(oneValueArgs NAME)
114120
set(multiValueArgs SRCS LIBS)
115121
cmake_parse_arguments(
@@ -120,12 +126,9 @@ function(add_umf_test)
120126
${ARGN})
121127

122128
build_umf_test(
123-
NAME
124-
${ARG_NAME}
125-
SRCS
126-
${ARG_SRCS}
127-
LIBS
128-
${ARG_LIBS})
129+
NAME ${ARG_NAME}
130+
SRCS ${ARG_SRCS}
131+
LIBS ${ARG_LIBS})
129132

130133
set(TEST_NAME umf-${ARG_NAME})
131134
set(TEST_TARGET_NAME umf_test-${ARG_NAME})
@@ -491,8 +494,10 @@ add_umf_test(
491494
add_umf_test(NAME ipc_negative SRCS ipc_negative.cpp)
492495

493496
function(add_umf_ipc_test)
494-
# Parameters: * TEST - a name of the test * SRC_DIR - source files directory
495-
# path
497+
# Parameters:
498+
#
499+
# * TEST - a name of the test
500+
# * SRC_DIR - source files directory path
496501
set(oneValueArgs TEST SRC_DIR)
497502
cmake_parse_arguments(
498503
ARG
@@ -526,64 +531,42 @@ endfunction()
526531
if(LINUX)
527532
if(NOT UMF_DISABLE_HWLOC AND UMF_POOL_SCALABLE_ENABLED)
528533
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)
534+
NAME ipc_os_prov_consumer
535+
SRCS ipc_os_prov_consumer.c common/ipc_common.c
536+
common/ipc_os_prov_common.c)
535537
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)
538+
NAME ipc_os_prov_producer
539+
SRCS ipc_os_prov_producer.c common/ipc_common.c
540+
common/ipc_os_prov_common.c)
542541
add_umf_ipc_test(TEST ipc_os_prov_anon_fd)
543542
add_umf_ipc_test(TEST ipc_os_prov_shm)
544543

545544
if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
546545
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})
546+
NAME ipc_os_prov_proxy
547+
SRCS ipc_os_prov_proxy.c common/ipc_common.c
548+
LIBS ${UMF_UTILS_FOR_TEST})
554549
add_umf_ipc_test(TEST ipc_os_prov_proxy)
555550
endif()
556551

557552
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)
553+
NAME ipc_devdax_prov_consumer
554+
SRCS ipc_devdax_prov_consumer.c common/ipc_common.c
555+
common/ipc_os_prov_common.c)
564556
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)
557+
NAME ipc_devdax_prov_producer
558+
SRCS ipc_devdax_prov_producer.c common/ipc_common.c
559+
common/ipc_os_prov_common.c)
571560
add_umf_ipc_test(TEST ipc_devdax_prov)
572561

573562
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)
563+
NAME ipc_file_prov_consumer
564+
SRCS ipc_file_prov_consumer.c common/ipc_common.c
565+
common/ipc_os_prov_common.c)
580566
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)
567+
NAME ipc_file_prov_producer
568+
SRCS ipc_file_prov_producer.c common/ipc_common.c
569+
common/ipc_os_prov_common.c)
587570
add_umf_ipc_test(TEST ipc_file_prov)
588571
add_umf_ipc_test(TEST ipc_file_prov_fsdax)
589572
endif()
@@ -594,59 +577,33 @@ if(LINUX)
594577
AND UMF_BUILD_LEVEL_ZERO_PROVIDER
595578
AND UMF_BUILD_LIBUMF_POOL_DISJOINT)
596579
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})
580+
NAME ipc_level_zero_prov_consumer
581+
SRCS providers/ipc_level_zero_prov_consumer.c common/ipc_common.c
582+
providers/ipc_level_zero_prov_common.c
583+
${UMF_UTILS_DIR}/utils_level_zero.cpp
584+
LIBS ze_loader disjoint_pool ${UMF_UTILS_FOR_TEST})
608585
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})
586+
NAME ipc_level_zero_prov_producer
587+
SRCS providers/ipc_level_zero_prov_producer.c common/ipc_common.c
588+
providers/ipc_level_zero_prov_common.c
589+
${UMF_UTILS_DIR}/utils_level_zero.cpp
590+
LIBS ze_loader disjoint_pool ${UMF_UTILS_FOR_TEST})
620591
add_umf_ipc_test(TEST ipc_level_zero_prov SRC_DIR providers)
621592
endif()
622593

623594
if(UMF_BUILD_GPU_TESTS
624595
AND UMF_BUILD_CUDA_PROVIDER
625596
AND UMF_BUILD_LIBUMF_POOL_DISJOINT)
626597
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})
598+
NAME ipc_cuda_prov_consumer
599+
SRCS providers/ipc_cuda_prov_consumer.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})
638602
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})
603+
NAME ipc_cuda_prov_producer
604+
SRCS providers/ipc_cuda_prov_producer.c common/ipc_common.c
605+
providers/ipc_cuda_prov_common.c providers/cuda_helpers.cpp
606+
LIBS cuda disjoint_pool ${UMF_UTILS_FOR_TEST})
650607
add_umf_ipc_test(TEST ipc_cuda_prov SRC_DIR providers)
651608
endif()
652609
else()

0 commit comments

Comments
 (0)