Cleanup libcheck related code (twitter#211)

- Ref twitter#202, twitter/pelikan@14fcd34 - Replace CHECK_WORKING with CHECK_FOUND - call make test instead of make check - Fix Cmake warning "Policy CMP0075" by remove CMAKE_REQUIRED_LIBRARIES
michalbiesek · Sep 12, 2019 · 7eb6424 · 7eb6424
1 parent 683bc1a
commit 7eb6424
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -82,7 +82,6 @@ if(BUILD_AND_INSTALL_CHECK)
 
     set(CHECK_ROOT_DIR "${LIBCHECK_PREFIX}")
     set(CMAKE_REQUIRED_INCLUDES "${CHECK_ROOT_DIR}/include")    # these make check link correctly in ccommon and pelikan
-    set(CMAKE_REQUIRED_LIBRARIES "${CHECK_ROOT_DIR}/lib")
 endif()
 
 include(CheckIncludeFiles)
@@ -156,15 +155,6 @@ include(FindPackageHandleStandardArgs)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
 
 find_package(Check)
-if(NOT CHECK_FOUND)
-    message(WARNING "Check is required to build and run tests")
-endif(NOT CHECK_FOUND)
-if(CHECK_FOUND)
-    check_symbol_exists(ck_assert_int_eq check.h CHECK_WORKING)
-    if(NOT CHECK_WORKING)
-        message(WARNING "Check version too old to build tests")
-    endif(NOT CHECK_WORKING)
-endif(CHECK_FOUND)
 
 if (HAVE_ITT_INSTRUMENTATION)
     if(PKG_CONFIG_FOUND)
@@ -192,10 +182,10 @@ include_directories(
 
 add_subdirectory(src)
 
-if(CHECK_WORKING)
-    include_directories(${include_directories} "${CHECK_INCLUDES}")
+if(CHECK_FOUND)
+    include_directories(${include_directories} ${CHECK_INCLUDES})
     add_subdirectory(test)
-endif(CHECK_WORKING)
+endif(CHECK_FOUND)
 
 
 if(HAVE_RUST)
@@ -221,4 +211,4 @@ message(STATUS "HAVE_SIGNAME: " ${HAVE_SIGNAME})
 
 message(STATUS "HAVE_BACKTRACE: " ${HAVE_BACKTRACE})
 
-message(STATUS "CHECK_WORKING: " ${CHECK_WORKING})
+message(STATUS "CHECK_FOUND: " ${CHECK_FOUND})
diff --git a/ci/run.sh b/ci/run.sh
@@ -18,7 +18,7 @@ fi
 
 export RUST_BACKTRACE=full
 
-mkdir -p _build && ( cd _build && "${cmake_cmd[@]}" .. && make && make check )
+mkdir -p _build && ( cd _build && "${cmake_cmd[@]}" .. && make && make test )
 RESULT=$?
 
 egrep -r ":F:|:E:" . |grep -v 'Binary file' || true

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,4 @@
-include_directories(${include_directories} CHECK_INCLUDES)
-
-add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
+include_directories(${include_directories} ${CHECK_INCLUDES})
 
 add_subdirectory(array)
 add_subdirectory(bstring)

diff --git a/test/array/CMakeLists.txt b/test/array/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/bstring/CMakeLists.txt b/test/bstring/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/buffer/CMakeLists.txt b/test/buffer/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/channel/pipe/CMakeLists.txt b/test/channel/pipe/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/channel/tcp/CMakeLists.txt b/test/channel/tcp/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/event/CMakeLists.txt b/test/event/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/log/CMakeLists.txt b/test/log/CMakeLists.txt
@@ -24,5 +24,4 @@ if(OS_PLATFORM STREQUAL "OS_DARWIN")
     set_target_properties(${test_name} PROPERTIES LINK_FLAGS "-Wl,-F/System/Library/Frameworks")
 endif()
 
-add_dependencies(check ${test_name} ccommon-static)
 add_test(${test_name} ${test_name})
diff --git a/test/metric/CMakeLists.txt b/test/metric/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/option/CMakeLists.txt b/test/option/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/pool/CMakeLists.txt b/test/pool/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/rbuf/CMakeLists.txt b/test/rbuf/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/ring_array/CMakeLists.txt b/test/ring_array/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/time/timer/CMakeLists.txt b/test/time/timer/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})
diff --git a/test/time/wheel/CMakeLists.txt b/test/time/wheel/CMakeLists.txt
@@ -6,5 +6,4 @@ set(source check_${suite}.c)
 add_executable(${test_name} ${source})
 target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m)
 
-add_dependencies(check ${test_name})
 add_test(${test_name} ${test_name})