Commit 8024ee46 authored by Dominik Charousset's avatar Dominik Charousset

Fix openssl unit test setup

parent f8c5b46c
......@@ -77,11 +77,10 @@ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/caf"
if(NOT CAF_NO_UNIT_TESTS)
add_executable(caf-openssl-test
"${PROJECT_SOURCE_DIR}/libcaf_test/src/caf-test.cpp"
"${PROJECT_SOURCE_DIR}/libcaf_test/caf/test/unit_test.hpp"
"${PROJECT_SOURCE_DIR}/libcaf_test/caf/test/unit_test_impl.hpp"
test/openssl-test.cpp
${CAF_OPENSSL_TEST_SOURCES}
$<TARGET_OBJECTS:libcaf_openssl_obj>)
target_include_directories(caf-openssl-test PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/test")
target_compile_definitions(caf-openssl-test PRIVATE libcaf_openssl_EXPORTS)
target_link_libraries(caf-openssl-test caf::core caf::io
${OPENSSL_LIBRARIES} ${CAF_EXTRA_LDFLAGS})
......
#define CAF_TEST_NO_MAIN
#include "caf/test/unit_test_impl.hpp"
#include "openssl-test.hpp"
#include "caf/io/middleman.hpp"
int main(int argc, char** argv) {
caf::init_global_meta_objects<caf::openssl_test_type_ids>();
caf::io::middleman::init_global_meta_objects();
return caf::test::main(argc, argv);
}
#include "caf/test/dsl.hpp"
#include <cstdint>
CAF_BEGIN_TYPE_ID_BLOCK(openssl_test, caf::first_custom_type_id)
CAF_ADD_TYPE_ID(openssl_test, (std::vector<int32_t>) )
CAF_END_TYPE_ID_BLOCK(openssl_test)
......@@ -20,7 +20,7 @@
#include "caf/openssl/all.hpp"
#include "caf/test/dsl.hpp"
#include "openssl-test.hpp"
#include "caf/config.hpp"
......@@ -43,12 +43,6 @@
#include "caf/all.hpp"
#include "caf/io/all.hpp"
CAF_BEGIN_TYPE_ID_BLOCK(message_tests, first_custom_type_id)
CAF_ADD_TYPE_ID(message_tests, (std::vector<int>))
CAF_END_TYPE_ID_BLOCK(message_tests)
using namespace caf;
namespace {
......
......@@ -18,7 +18,7 @@
#define CAF_SUITE openssl.dynamic_remote_actor
#include "caf/test/dsl.hpp"
#include "openssl-test.hpp"
#include <algorithm>
#include <signal.h>
......@@ -30,12 +30,6 @@
#include "caf/io/all.hpp"
#include "caf/openssl/all.hpp"
CAF_BEGIN_TYPE_ID_BLOCK(dynamic_remote_actor_tests, first_custom_type_id)
CAF_ADD_TYPE_ID(dynamic_remote_actor_tests, (std::vector<int>))
CAF_END_TYPE_ID_BLOCK(dynamic_remote_actor_tests)
using namespace caf;
namespace {
......
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