Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
b8cd2cc0
Commit
b8cd2cc0
authored
Aug 05, 2023
by
Samir Halilcevic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix legacy tests in CMake
parent
e708be17
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
18 deletions
+29
-18
CMakeLists.txt
CMakeLists.txt
+14
-3
libcaf_core/CMakeLists.txt
libcaf_core/CMakeLists.txt
+3
-3
libcaf_io/CMakeLists.txt
libcaf_io/CMakeLists.txt
+2
-2
libcaf_net/CMakeLists.txt
libcaf_net/CMakeLists.txt
+3
-3
libcaf_net/tests/legacy/pem.cpp.in
libcaf_net/tests/legacy/pem.cpp.in
+6
-6
libcaf_openssl/CMakeLists.txt
libcaf_openssl/CMakeLists.txt
+1
-1
No files found.
CMakeLists.txt
View file @
b8cd2cc0
...
...
@@ -124,6 +124,17 @@ if(CAF_ENABLE_TESTING)
endif
()
endforeach
()
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
()
# -- make sure we have at least C++17 available --------------------------------
...
...
@@ -378,7 +389,7 @@ function(caf_add_component name)
target_link_libraries
(
${
tst_bin_target
}
PRIVATE libcaf_test
${
CAF_ADD_COMPONENT_DEPENDENCIES
}
)
target_include_directories
(
${
tst_bin_target
}
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test
s/legacy
"
)
if
(
CAF_ADD_COMPONENT_TEST_SUITES
)
caf_add_test_suites
(
${
tst_bin_target
}
${
CAF_ADD_COMPONENT_TEST_SUITES
}
)
endif
()
...
...
@@ -392,9 +403,9 @@ function(caf_add_component name)
target_link_libraries
(
${
tst_bin_target
}
PRIVATE libcaf_test
${
CAF_ADD_COMPONENT_DEPENDENCIES
}
)
target_include_directories
(
${
tst_bin_target
}
PRIVATE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test"
)
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/test
s/legacy
"
)
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
()
target_link_libraries
(
${
pub_lib_target
}
${
CAF_ADD_COMPONENT_DEPENDENCIES
}
)
...
...
libcaf_core/CMakeLists.txt
View file @
b8cd2cc0
...
...
@@ -217,8 +217,8 @@ caf_add_component(
caf/uri_builder.cpp
caf/uuid.cpp
LEGACY_TEST_SOURCES
test/core-test.cpp
test/nasty.cpp
test
s/legacy
/core-test.cpp
test
s/legacy
/nasty.cpp
LEGACY_TEST_SUITES
action
actor_clock
...
...
@@ -387,5 +387,5 @@ if(NOT CAF_USE_STD_FORMAT)
endif
()
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
()
libcaf_io/CMakeLists.txt
View file @
b8cd2cc0
...
...
@@ -60,7 +60,7 @@ caf_add_component(
caf/policy/tcp.cpp
caf/policy/udp.cpp
LEGACY_TEST_SOURCES
test/io-test.cpp
test
s/legacy
/io-test.cpp
LEGACY_TEST_SUITES
detail.prometheus_broker
io.basp.message_queue
...
...
@@ -77,5 +77,5 @@ caf_add_component(
io.worker
)
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
()
libcaf_net/CMakeLists.txt
View file @
b8cd2cc0
...
...
@@ -4,7 +4,7 @@ file(GLOB_RECURSE CAF_NET_HEADERS "caf/*.hpp")
# -- add targets ---------------------------------------------------------------
configure_file
(
test
/pem.cpp.in test
/pem.cpp @ONLY
)
configure_file
(
test
s/legacy/pem.cpp.in tests/legacy
/pem.cpp @ONLY
)
caf_add_component
(
net
...
...
@@ -94,8 +94,8 @@ caf_add_component(
caf/net/web_socket/server.cpp
caf/net/web_socket/upper_layer.cpp
LEGACY_TEST_SOURCES
${
CMAKE_CURRENT_BINARY_DIR
}
/test/pem.cpp
test/net-test.cpp
${
CMAKE_CURRENT_BINARY_DIR
}
/test
s/legacy
/pem.cpp
test
s/legacy
/net-test.cpp
LEGACY_TEST_SUITES
detail.convert_ip_endpoint
net.accept_socket
...
...
libcaf_net/tests/legacy/pem.cpp.in
View file @
b8cd2cc0
...
...
@@ -2,11 +2,11 @@
// clang-format off
const char* ca_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/ca.pem";
const char* cert_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/cert_1.pem";
const char* cert_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/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_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/key_1.pem";
const char* key_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test/net/ssl/key_2.pem";
const char* ca_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/ca.pem";
const char* cert_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/cert_1.pem";
const char* cert_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/cert_2.pem";
const char* key_1_enc_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/key_1_enc.pem";
const char* key_1_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/key_1.pem";
const char* key_2_pem_path = "@CMAKE_CURRENT_SOURCE_DIR@/test
s/legacy
/net/ssl/key_2.pem";
// clang-format on
libcaf_openssl/CMakeLists.txt
View file @
b8cd2cc0
...
...
@@ -22,7 +22,7 @@ caf_add_component(
caf/openssl/remote_actor.cpp
caf/openssl/session.cpp
LEGACY_TEST_SUITES
test/openssl-test.cpp
test
s/legacy
/openssl-test.cpp
LEGACY_TEST_SUITES
openssl.authentication
openssl.remote_actor
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment