Skip to content

Commit 087b23e

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request #1146 from KFilipek/task-unify_test_name
Change umf_test-* tests' prefix to test_*
2 parents 0e824fb + cb94612 commit 087b23e

39 files changed

+58
-58
lines changed

‎.github/workflows/reusable_dax.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ env:
3131
INSTL_DIR : "${{github.workspace}}/../install-dir"
3232
COVERAGE_DIR : "${{github.workspace}}/coverage"
3333
COVERAGE_NAME : "exports-coverage-dax"
34-
DAX_TESTS: "./test/umf_test-provider_file_memory ./test/umf_test-provider_devdax_memory"
34+
DAX_TESTS: "./test/test_provider_file_memory ./test/test_provider_devdax_memory"
3535

3636
jobs:
3737
dax:

‎.github/workflows/reusable_multi_numa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
BUILD_DIR : "${{github.workspace}}/build"
1111
COVERAGE_DIR : "${{github.workspace}}/coverage"
1212
COVERAGE_NAME : "exports-coverage-multinuma"
13-
NUMA_TESTS: "./test/umf_test-memspace_numa ./test/umf_test-provider_os_memory_multiple_numa_nodes"
13+
NUMA_TESTS: "./test/test_memspace_numa ./test/test_provider_os_memory_multiple_numa_nodes"
1414

1515
jobs:
1616
multi_numa:
@@ -60,13 +60,13 @@ jobs:
6060
# On RHEL, hwloc version is just a little too low.
6161
# Skip some tests until we upgrade hwloc and update CMake to properly handle local hwloc installation.
6262
# TODO: fix issue #560
63-
# TODO: add issue for -E umf-init_teardown - it is not clear why it fails
63+
# TODO: add issue for -E test_init_teardown - it is not clear why it fails
6464
- name: Run tests (on RHEL)
6565
if: matrix.os == 'rhel-9.1'
6666
working-directory: ${{github.workspace}}/build
6767
run: |
68-
ctest --output-on-failure --test-dir test -E "umf-provider_os_memory_multiple_numa_nodes|umf-init_teardown"
69-
./test/umf_test-provider_os_memory_multiple_numa_nodes \
68+
ctest --output-on-failure --test-dir test -E "test_provider_os_memory_multiple_numa_nodes|test_init_teardown"
69+
./test/test_provider_os_memory_multiple_numa_nodes \
7070
--gtest_filter="-*checkModeLocal/*:*checkModePreferredEmptyNodeset/*:testNuma.checkModeInterleave"
7171
7272
- name: Run NUMA tests under valgrind

‎.github/workflows/reusable_proxy_lib.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ jobs:
5959
working-directory: ${{env.BUILD_DIR}}
6060
run: LD_PRELOAD=./lib/libumf_proxy.so ctest --output-on-failure
6161

62-
- name: Run "./test/umf_test-memoryPool" with proxy library
62+
- name: Run "./test/test_memoryPool" with proxy library
6363
working-directory: ${{env.BUILD_DIR}}
64-
run: LD_PRELOAD=./lib/libumf_proxy.so ./test/umf_test-memoryPool
64+
run: LD_PRELOAD=./lib/libumf_proxy.so ./test/test_memoryPool
6565

6666
- name: Run "/usr/bin/ls" with proxy library
6767
working-directory: ${{env.BUILD_DIR}}

‎test/CMakeLists.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ function(build_umf_test)
4545
"${multiValueArgs}"
4646
${ARGN})
4747

48-
set(TEST_NAME umf-${ARG_NAME})
49-
set(TEST_TARGET_NAME umf_test-${ARG_NAME})
48+
set(TEST_NAME test_${ARG_NAME})
49+
set(TEST_TARGET_NAME test_${ARG_NAME})
5050

5151
set(LIB_DIRS ${LIB_DIRS} ${LIBHWLOC_LIBRARY_DIRS})
5252

@@ -130,8 +130,8 @@ function(add_umf_test)
130130
SRCS ${ARG_SRCS}
131131
LIBS ${ARG_LIBS})
132132

133-
set(TEST_NAME umf-${ARG_NAME})
134-
set(TEST_TARGET_NAME umf_test-${ARG_NAME})
133+
set(TEST_NAME test_${ARG_NAME})
134+
set(TEST_TARGET_NAME test_${ARG_NAME})
135135

136136
add_test(
137137
NAME ${TEST_NAME}
@@ -408,15 +408,15 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
408408
SRCS providers/provider_level_zero.cpp
409409
${UMF_UTILS_DIR}/utils_level_zero.cpp ${BA_SOURCES_FOR_TEST}
410410
LIBS ${UMF_UTILS_FOR_TEST})
411-
target_compile_definitions(umf_test-provider_level_zero_dlopen_global
411+
target_compile_definitions(test_provider_level_zero_dlopen_global
412412
PUBLIC USE_DLOPEN=1 OPEN_ZE_LIBRARY_GLOBAL=1)
413413

414414
add_umf_test(
415415
NAME provider_level_zero_dlopen_local
416416
SRCS providers/provider_level_zero.cpp
417417
${UMF_UTILS_DIR}/utils_level_zero.cpp ${BA_SOURCES_FOR_TEST}
418418
LIBS ${UMF_UTILS_FOR_TEST})
419-
target_compile_definitions(umf_test-provider_level_zero_dlopen_local
419+
target_compile_definitions(test_provider_level_zero_dlopen_local
420420
PUBLIC USE_DLOPEN=1 OPEN_ZE_LIBRARY_GLOBAL=0)
421421
endif()
422422

@@ -443,15 +443,15 @@ if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_CUDA_PROVIDER)
443443
SRCS providers/provider_cuda.cpp providers/cuda_helpers.cpp
444444
${BA_SOURCES_FOR_TEST}
445445
LIBS ${UMF_UTILS_FOR_TEST})
446-
target_compile_definitions(umf_test-provider_cuda_dlopen_global
446+
target_compile_definitions(test_provider_cuda_dlopen_global
447447
PUBLIC USE_DLOPEN=1 OPEN_CU_LIBRARY_GLOBAL=1)
448448

449449
add_umf_test(
450450
NAME provider_cuda_dlopen_local
451451
SRCS providers/provider_cuda.cpp providers/cuda_helpers.cpp
452452
${BA_SOURCES_FOR_TEST}
453453
LIBS ${UMF_UTILS_FOR_TEST})
454-
target_compile_definitions(umf_test-provider_cuda_dlopen_local
454+
target_compile_definitions(test_provider_cuda_dlopen_local
455455
PUBLIC USE_DLOPEN=1 OPEN_CU_LIBRARY_GLOBAL=0)
456456
else()
457457
message(
@@ -496,7 +496,7 @@ if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
496496
NAME proxy_lib_size_threshold
497497
SRCS ${BA_SOURCES_FOR_TEST} test_proxy_lib_size_threshold.cpp
498498
LIBS ${UMF_UTILS_FOR_TEST} umf_proxy)
499-
set_property(TEST umf-proxy_lib_size_threshold
499+
set_property(TEST test_proxy_lib_size_threshold
500500
PROPERTY ENVIRONMENT UMF_PROXY="size.threshold=64")
501501
endif()
502502

@@ -506,7 +506,7 @@ if(UMF_PROXY_LIB_ENABLED AND UMF_BUILD_SHARED_LIBRARY)
506506
SRCS ${BA_SOURCES_FOR_TEST} memoryPoolAPI.cpp
507507
malloc_compliance_tests.cpp
508508
LIBS ${UMF_UTILS_FOR_TEST} umf_proxy)
509-
target_compile_definitions(umf_test-proxy_lib_memoryPool
509+
target_compile_definitions(test_proxy_lib_memoryPool
510510
PUBLIC UMF_PROXY_LIB_ENABLED=1)
511511
endif()
512512

@@ -530,7 +530,7 @@ function(add_umf_ipc_test)
530530
""
531531
${ARGN})
532532

533-
set(TEST_NAME umf-${ARG_TEST})
533+
set(TEST_NAME test_${ARG_TEST})
534534

535535
if(DEFINED ARG_SRC_DIR)
536536
set(SRC_DIR ${ARG_SRC_DIR})
@@ -650,7 +650,7 @@ if(LINUX
650650
LIBS dl)
651651
# append LD_LIBRARY_PATH to the libumf
652652
set_property(
653-
TEST umf-init_teardown
653+
TEST test_init_teardown
654654
PROPERTY ENVIRONMENT_MODIFICATION
655655
"LD_LIBRARY_PATH=path_list_append:${CMAKE_BINARY_DIR}/lib")
656656
endif()

‎test/ipc_devdax_prov.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2024 Intel Corporation
2+
# Copyright (C) 2024-2025 Intel Corporation
33
#
44
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
55
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -25,10 +25,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
2525
UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
2626

2727
echo "Starting ipc_devdax_prov CONSUMER on port $PORT ..."
28-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_devdax_prov_consumer $PORT &
28+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_devdax_prov_consumer $PORT &
2929

3030
echo "Waiting 1 sec ..."
3131
sleep 1
3232

3333
echo "Starting ipc_devdax_prov PRODUCER on port $PORT ..."
34-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_devdax_prov_producer $PORT
34+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_devdax_prov_producer $PORT

‎test/ipc_file_prov.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2024 Intel Corporation
2+
# Copyright (C) 2024-2025 Intel Corporation
33
#
44
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
55
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -20,13 +20,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
2020
rm -f ${FILE_NAME}
2121

2222
echo "Starting ipc_file_prov CONSUMER on port $PORT ..."
23-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT ${FILE_NAME}_consumer &
23+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_consumer $PORT ${FILE_NAME}_consumer &
2424

2525
echo "Waiting 1 sec ..."
2626
sleep 1
2727

2828
echo "Starting ipc_file_prov PRODUCER on port $PORT ..."
29-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT ${FILE_NAME}_producer
29+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_producer $PORT ${FILE_NAME}_producer
3030

3131
# remove the SHM file
3232
rm -f ${FILE_NAME}

‎test/ipc_file_prov_fsdax.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2024 Intel Corporation
2+
# Copyright (C) 2024-2025 Intel Corporation
33
#
44
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
55
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -31,13 +31,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
3131
rm -f ${FILE_NAME}
3232

3333
echo "Starting ipc_file_prov_fsdax CONSUMER on port $PORT ..."
34-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_consumer $PORT $FILE_NAME &
34+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_consumer $PORT $FILE_NAME &
3535

3636
echo "Waiting 1 sec ..."
3737
sleep 1
3838

3939
echo "Starting ipc_file_prov_fsdax PRODUCER on port $PORT ..."
40-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_file_prov_producer $PORT $FILE_NAME_2
40+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_file_prov_producer $PORT $FILE_NAME_2
4141

4242
# remove the SHM file
4343
rm -f ${FILE_NAME}

‎test/ipc_os_prov_anon_fd.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
1515
UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
1616

1717
echo "Starting ipc_os_prov_anon_fd CONSUMER on port $PORT ..."
18-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
18+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
1919

2020
echo "Waiting 1 sec ..."
2121
sleep 1
2222

2323
echo "Starting ipc_os_prov_anon_fd PRODUCER on port $PORT ..."
24-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_producer $PORT
24+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_producer $PORT

‎test/ipc_os_prov_proxy.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2024 Intel Corporation
2+
# Copyright (C) 2024-2025 Intel Corporation
33
#
44
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
55
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -17,10 +17,10 @@ LD_PRELOAD_VAL="../lib/libumf_proxy.so"
1717
PORT=$(( 1024 + ( $$ % ( 65535 - 1024 ))))
1818

1919
echo "Starting CONSUMER on port $PORT ..."
20-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
20+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
2121

2222
echo "Waiting 1 sec ..."
2323
sleep 1
2424

2525
echo "Starting ipc_os_prov_proxy PRODUCER on port $PORT ..."
26-
LD_PRELOAD=$LD_PRELOAD_VAL UMF_LOG=$UMF_LOG_VAL UMF_PROXY=$UMF_PROXY_VAL ./umf_test-ipc_os_prov_proxy $PORT
26+
LD_PRELOAD=$LD_PRELOAD_VAL UMF_LOG=$UMF_LOG_VAL UMF_PROXY=$UMF_PROXY_VAL ./test_ipc_os_prov_proxy $PORT

‎test/ipc_os_prov_shm.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (C) 2024 Intel Corporation
2+
# Copyright (C) 2024-2025 Intel Corporation
33
#
44
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
55
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
@@ -20,13 +20,13 @@ UMF_LOG_VAL="level:debug;flush:debug;output:stderr;pid:yes"
2020
rm -f /dev/shm/${SHM_NAME}
2121

2222
echo "Starting ipc_os_prov_shm CONSUMER on port $PORT ..."
23-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_consumer $PORT &
23+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_consumer $PORT &
2424

2525
echo "Waiting 1 sec ..."
2626
sleep 1
2727

2828
echo "Starting ipc_os_prov_shm PRODUCER on port $PORT ..."
29-
UMF_LOG=$UMF_LOG_VAL ./umf_test-ipc_os_prov_producer $PORT $SHM_NAME
29+
UMF_LOG=$UMF_LOG_VAL ./test_ipc_os_prov_producer $PORT $SHM_NAME
3030

3131
# remove the SHM file
3232
rm -f /dev/shm/${SHM_NAME}

0 commit comments

Comments
 (0)