X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=test%2FCMakeLists.txt;h=67cd47c69feef602275422af603ea0e8139f4d68;hb=92d18858b417309f6bdee6bce464a4f3d6a375fd;hp=0279f60ca22553c9ebe362bb25120d566d392234;hpb=6b7d2bf0319e0bd48bd6aa4ad8c56a935f98b0d2;p=awesomized%2Flibmemcached

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0279f60c..67cd47c6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,31 +2,37 @@ if(NOT BUILD_TESTING OR NOT CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     return()
 endif()
 
+configure_init(${CMAKE_CURRENT_BINARY_DIR}/conf.h)
+configure_append("#define MEMCACHED_BINARY getenv_else(\"MEMCACHED_BINARY\", \"@MEMCACHED_BINARY@\")\n")
+configure_define_string(TESTING_ROOT)
+configure_define_string(SOURCES_ROOT)
+configure_define_string(LIBMEMCACHED_WITH_SASL_PWDB)
+configure_define_string(LIBMEMCACHED_WITH_SASL_CONF)
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
 include(Catch)
-include(CheckTbb)
 
-check_decl(pipe2 unistd.h)
-check_decl(SOCK_NONBLOCK sys/socket.h)
-check_decl(SOCK_CLOEXEC sys/socket.h)
-check_header(sys/wait.h)
-check_decl(waitid sys/wait.h)
+check_symbol(pipe2 unistd.h)
+check_symbol(SOCK_NONBLOCK sys/socket.h)
+check_symbol(SOCK_CLOEXEC sys/socket.h)
+check_include(sys/wait.h)
+check_symbol(waitid sys/wait.h)
 if(HAVE_WAITID)
-    check_compiles(HAVE_WAITID_NOWAIT "
-            siginfo_t s;
-            waitid(P_ALL, 0, &s, WNOWAIT|WEXITED);"
-            sys/types.h sys/wait.h)
+    check_c_source("
+            #include <sys/types.h>
+            #include <sys/wait.h>
+            int main() {
+                siginfo_t s;
+                return waitid(P_ALL, 0, &s, WNOWAIT|WEXITED);
+            }"
+            HAVE_WAITID_NOWAIT
+    )
 endif()
 if(NOT HAVE_SYS_WAIT_H)
     message(SEND_ERROR "Could not find header <sys/wait.h>")
     set(ENV{INVALID_CONFIGURATION} 1)
 endif()
 
-# parallelism
-if(NOT (thread IN_LIST ENABLE_SANITIZERS))
-    check_tbb()
-endif()
-
 # memcached(1)
 if(NOT MEMCACHED_BINARY)
     find_package(Memcached)
@@ -37,9 +43,12 @@ if(NOT MEMCACHED_BINARY)
     set(ENV{INVALID_CONFIGURATION} 1)
 endif()
 
+add_executable(timeout timeout.c)
+target_include_directories(timeout PRIVATE ${CMAKE_BINARY_DIR})
+
 file(GLOB_RECURSE TESTING_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-set(TESTING_ROOT ${CMAKE_CURRENT_BINARY_DIR})
-set(SOURCES_ROOT ${CMAKE_SOURCE_DIR})
+set(TESTING_ROOT "${CMAKE_CURRENT_BINARY_DIR}")
+set(SOURCES_ROOT "${CMAKE_SOURCE_DIR}")
 set_source_files_properties(main.cpp PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
 add_executable(runtests ${TESTING_SRC})
 set_target_properties(runtests PROPERTIES CXX_STANDARD 17)
@@ -50,23 +59,20 @@ target_include_directories(runtests PRIVATE
         ${CMAKE_BINARY_DIR}/src)
 target_link_libraries(runtests PRIVATE libhashkit libmemcachedinternal libmemcachedutil)
 
-if(HAVE_TBB)
-    target_link_libraries(runtests PRIVATE ${LIBTBB})
+# parallelism
+if(NOT (thread IN_LIST ENABLE_SANITIZERS))
+    include(CheckCpp17Parallelism)
+    if(HAVE_CPP17_PARALLELISM)
+        target_link_libraries(runtests PRIVATE cpp17::parallelism)
+    endif()
 endif()
 
-add_dependencies(runtests ${CLIENTS})
+add_dependencies(runtests ${CLIENTS} timeout)
 if(TARGET memaslap)
-    set(HAVE_MEMASLAP 1)
-    add_dependencies(runtests memaslap)
+    configure_set(HAVE_MEMASLAP 1)
+    add_dependencies(runtests aslap)
 endif()
 
-configure_file(conf.h.in conf.h @ONLY)
+configure_file(${CONFIGURE_FILE_IN} ${CONFIGURE_FILE_OUT} @ONLY)
 
-catch_discover_tests(runtests
-        TEST_SPEC "lib*")
-catch_discover_tests(runtests
-        TEST_SPEC "hashkit*")
-catch_discover_tests(runtests
-        TEST_SPEC "memcached*")
-catch_discover_tests(runtests
-        TEST_SPEC "bin/*")
+catch_discover_tests(runtests TEST_SPEC "lib*,hashkit*,memcached*,bin/*")