1.1 --- a/test/CMakeLists.txt Sat Apr 16 17:28:36 2022 +0200 1.2 +++ b/test/CMakeLists.txt Sat Apr 16 18:02:10 2022 +0200 1.3 @@ -1,27 +1,3 @@ 1.4 -# Transitional support for CTest written tests 1.5 -message(CHECK_START "Searching for CUnit test framework") 1.6 - 1.7 -find_path(CUNIT_INCLUDE_DIR NAMES CUnit/CUnit.h) 1.8 -find_library(CUNIT_LIBRARY NAMES cunit libcunit cunitlib) 1.9 -include(FindPackageHandleStandardArgs) 1.10 -find_package_handle_standard_args(CUnit DEFAULT_MSG CUNIT_LIBRARY CUNIT_INCLUDE_DIR) 1.11 - 1.12 -if (CUNIT_FOUND) 1.13 - message(CHECK_PASS "found: compiling tests.") 1.14 - set(TESTS 1.15 - test_list 1.16 - ) 1.17 - 1.18 - foreach (test ${TESTS}) 1.19 - add_executable(${test} ${test}.c) 1.20 - target_link_libraries(${test} PRIVATE ucx_static ${CUNIT_LIBRARY}) 1.21 - target_include_directories(${test} PRIVATE ${CUNIT_INCLUDE_DIR}) 1.22 - add_test(NAME ${test} COMMAND ${test} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}") 1.23 - endforeach () 1.24 -else () 1.25 - message(CHECK_FAIL "not found: CUnit tests will not be available.") 1.26 -endif () 1.27 - 1.28 # Load Google Test Framework 1.29 set(CMAKE_CXX_STANDARD 11) 1.30 1.31 @@ -39,8 +15,10 @@ 1.32 1.33 add_executable(ucxtest 1.34 test_allocator.cpp 1.35 + test_list.cpp 1.36 test_tree.cpp 1.37 selftest.cpp 1.38 + util_allocator.c 1.39 ) 1.40 target_link_libraries(ucxtest PRIVATE ucx_static gtest_main) 1.41 gtest_discover_tests(ucxtest)