Commit b8cd2cc0 authored by Samir Halilcevic's avatar Samir Halilcevic

Fix legacy tests in CMake

parent e708be17
...@@ -124,6 +124,17 @@ if(CAF_ENABLE_TESTING) ...@@ -124,6 +124,17 @@ if(CAF_ENABLE_TESTING)
endif() endif()
endforeach() endforeach()
endfunction() endfunction()
function(caf_add_legacy_test_suites target)
foreach(suiteName ${ARGN})
if(NOT ${suiteName} IN_LIST CAF_EXCLUDE_TESTS)
string(REPLACE "." "/" suitePath ${suiteName})
target_sources(${target} PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy/${suitePath}.cpp")
add_test(NAME ${suiteName}
COMMAND ${target} -r300 -n -v5 -s "^${suiteName}$")
endif()
endforeach()
endfunction()
endif() endif()
# -- make sure we have at least C++17 available -------------------------------- # -- make sure we have at least C++17 available --------------------------------
...@@ -378,7 +389,7 @@ function(caf_add_component name) ...@@ -378,7 +389,7 @@ function(caf_add_component name)
target_link_libraries(${tst_bin_target} PRIVATE libcaf_test target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
${CAF_ADD_COMPONENT_DEPENDENCIES}) ${CAF_ADD_COMPONENT_DEPENDENCIES})
target_include_directories(${tst_bin_target} PRIVATE target_include_directories(${tst_bin_target} PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/test") "${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy")
if(CAF_ADD_COMPONENT_TEST_SUITES) if(CAF_ADD_COMPONENT_TEST_SUITES)
caf_add_test_suites(${tst_bin_target} ${CAF_ADD_COMPONENT_TEST_SUITES}) caf_add_test_suites(${tst_bin_target} ${CAF_ADD_COMPONENT_TEST_SUITES})
endif() endif()
...@@ -392,9 +403,9 @@ function(caf_add_component name) ...@@ -392,9 +403,9 @@ function(caf_add_component name)
target_link_libraries(${tst_bin_target} PRIVATE libcaf_test target_link_libraries(${tst_bin_target} PRIVATE libcaf_test
${CAF_ADD_COMPONENT_DEPENDENCIES}) ${CAF_ADD_COMPONENT_DEPENDENCIES})
target_include_directories(${tst_bin_target} PRIVATE target_include_directories(${tst_bin_target} PRIVATE
"${CMAKE_CURRENT_SOURCE_DIR}/test") "${CMAKE_CURRENT_SOURCE_DIR}/tests/legacy")
if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES) if(CAF_ADD_COMPONENT_LEGACY_TEST_SUITES)
caf_add_test_suites(${tst_bin_target} ${CAF_ADD_COMPONENT_LEGACY_TEST_SUITES}) caf_add_legacy_test_suites(${tst_bin_target} ${CAF_ADD_COMPONENT_LEGACY_TEST_SUITES})
endif() endif()
endif() endif()
target_link_libraries(${pub_lib_target} ${CAF_ADD_COMPONENT_DEPENDENCIES}) target_link_libraries(${pub_lib_target} ${CAF_ADD_COMPONENT_DEPENDENCIES})
......
...@@ -217,8 +217,8 @@ caf_add_component( ...@@ -217,8 +217,8 @@ caf_add_component(
caf/uri_builder.cpp caf/uri_builder.cpp
caf/uuid.cpp caf/uuid.cpp
LEGACY_TEST_SOURCES LEGACY_TEST_SOURCES
test/core-test.cpp tests/legacy/core-test.cpp
test/nasty.cpp tests/legacy/nasty.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
action action
actor_clock actor_clock
...@@ -387,5 +387,5 @@ if(NOT CAF_USE_STD_FORMAT) ...@@ -387,5 +387,5 @@ if(NOT CAF_USE_STD_FORMAT)
endif() endif()
if(CAF_ENABLE_TESTING AND CAF_ENABLE_EXCEPTIONS) if(CAF_ENABLE_TESTING AND CAF_ENABLE_EXCEPTIONS)
caf_add_test_suites(caf-core-legacy-test custom_exception_handler) caf_add_legacy_test_suites(caf-core-legacy-test custom_exception_handler)
endif() endif()
...@@ -60,7 +60,7 @@ caf_add_component( ...@@ -60,7 +60,7 @@ caf_add_component(
caf/policy/tcp.cpp caf/policy/tcp.cpp
caf/policy/udp.cpp caf/policy/udp.cpp
LEGACY_TEST_SOURCES LEGACY_TEST_SOURCES
test/io-test.cpp tests/legacy/io-test.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
detail.prometheus_broker detail.prometheus_broker
io.basp.message_queue io.basp.message_queue
...@@ -77,5 +77,5 @@ caf_add_component( ...@@ -77,5 +77,5 @@ caf_add_component(
io.worker) io.worker)
if(CAF_ENABLE_TESTING AND UNIX) if(CAF_ENABLE_TESTING AND UNIX)
caf_add_test_suites(caf-io-legacy-test io.middleman) caf_add_legacy_test_suites(caf-io-legacy-test io.middleman)
endif() endif()
...@@ -4,7 +4,7 @@ file(GLOB_RECURSE CAF_NET_HEADERS "caf/*.hpp") ...@@ -4,7 +4,7 @@ file(GLOB_RECURSE CAF_NET_HEADERS "caf/*.hpp")
# -- add targets --------------------------------------------------------------- # -- add targets ---------------------------------------------------------------
configure_file(test/pem.cpp.in test/pem.cpp @ONLY) configure_file(tests/legacy/pem.cpp.in tests/legacy/pem.cpp @ONLY)
caf_add_component( caf_add_component(
net net
...@@ -94,8 +94,8 @@ caf_add_component( ...@@ -94,8 +94,8 @@ caf_add_component(
caf/net/web_socket/server.cpp caf/net/web_socket/server.cpp
caf/net/web_socket/upper_layer.cpp caf/net/web_socket/upper_layer.cpp
LEGACY_TEST_SOURCES LEGACY_TEST_SOURCES
${CMAKE_CURRENT_BINARY_DIR}/test/pem.cpp ${CMAKE_CURRENT_BINARY_DIR}/tests/legacy/pem.cpp
test/net-test.cpp tests/legacy/net-test.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
detail.convert_ip_endpoint detail.convert_ip_endpoint
net.accept_socket net.accept_socket
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
// clang-format off // clang-format off
const char* ca_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/ca.pem"; const char* ca_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/ca.pem";
const char* cert_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/cert_1.pem"; const char* cert_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/cert_1.pem";
const char* cert_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/cert_2.pem"; const char* cert_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/cert_2.pem";
const char* key_1_enc_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/key_1_enc.pem"; const char* key_1_enc_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/key_1_enc.pem";
const char* key_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/key_1.pem"; const char* key_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/key_1.pem";
const char* key_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/key_2.pem"; const char* key_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/tests/legacy/net/ssl/key_2.pem";
// clang-format on // clang-format on
...@@ -22,7 +22,7 @@ caf_add_component( ...@@ -22,7 +22,7 @@ caf_add_component(
caf/openssl/remote_actor.cpp caf/openssl/remote_actor.cpp
caf/openssl/session.cpp caf/openssl/session.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
test/openssl-test.cpp tests/legacy/openssl-test.cpp
LEGACY_TEST_SUITES LEGACY_TEST_SUITES
openssl.authentication openssl.authentication
openssl.remote_actor) openssl.remote_actor)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment