You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2021/10/07 18:47:05 UTC
[celix] 02/02: Removes integration test for pubsub_admin _v1
versions
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/remove_psa_versions_v1
in repository https://gitbox.apache.org/repos/asf/celix.git
commit f1efeaca317d6ab6423bb54b5c61d4224535563a
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Thu Oct 7 20:41:43 2021 +0200
Removes integration test for pubsub_admin _v1 versions
---
bundles/pubsub/integration/CMakeLists.txt | 307 +-----------------------------
1 file changed, 4 insertions(+), 303 deletions(-)
diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt
index 74d4909..6bec7f8 100644
--- a/bundles/pubsub/integration/CMakeLists.txt
+++ b/bundles/pubsub/integration/CMakeLists.txt
@@ -189,129 +189,6 @@ if (BUILD_PUBSUB_PSA_UDP_MC)
endif()
if (BUILD_PUBSUB_PSA_TCP)
- add_celix_container(pubsub_tcp_wire_v1_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::shell
- Celix::shell_tui
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v1
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_tcp
- pubsub_sut
- pubsub_tst
- )
- target_link_libraries(pubsub_tcp_wire_v1_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_wire_v1_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_tcp_wire_v1_tests COMMAND pubsub_tcp_wire_v1_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_wire_v1_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_tcp_wire_v1_tests SCAN_DIR ..)
-
- add_celix_container(pubsub_tcp_wire_v2_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::shell
- Celix::shell_tui
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_tcp
- pubsub_sut
- pubsub_tst
- )
- target_link_libraries(pubsub_tcp_wire_v2_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_wire_v2_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_tcp_wire_v2_tests COMMAND pubsub_tcp_wire_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_wire_v2_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_tcp_wire_v2_tests SCAN_DIR ..)
-
- add_celix_container(pubsub_tcp_wire_v2_with_no_scope_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- CELIX_PUBSUB_TEST_USE_NEGATIVE_SCOPE_FILTER=false
- BUNDLES
- Celix::shell
- Celix::shell_tui
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_tcp
- pubsub_sut
- pubsub_tst
- )
- target_link_libraries(pubsub_tcp_wire_v2_with_no_scope_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_wire_v2_with_no_scope_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_tcp_wire_v2_with_no_scope_tests COMMAND pubsub_tcp_wire_v2_with_no_scope_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_wire_v2_with_no_scope_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_tcp_wire_v2_with_no_scope_tests SCAN_DIR ..)
-
- add_celix_container(pubsub_tcp_endpoint_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubEndpointIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::shell
- Celix::shell_tui
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_tcp
- pubsub_endpoint_tst
- pubsub_endpoint_sut
- pubsub_loopback
- )
- target_link_libraries(pubsub_tcp_endpoint_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_endpoint_tests SYSTEM PRIVATE gtest)
-
- add_celix_container(pstm_deadlock_tcp_test
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/pstm_deadlock_test/test_runner.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_tcp
- Celix::shell
- Celix::shell_tui
- )
- target_compile_definitions(pstm_deadlock_tcp_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
- target_link_libraries(pstm_deadlock_tcp_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Jansson Celix::dfi)
- target_include_directories(pstm_deadlock_tcp_test SYSTEM PRIVATE pstm_deadlock_tcp_test)
-
- #Note we do not link to bundles, as result (to ensure a bundle zip file is created) an dependency on the bundle is needed.
- add_dependencies(pstm_deadlock_tcp_test pubsub_deadlock_sut_bundle)
-
- #Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_tcp_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_tcp_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
-
- add_test(NAME pstm_deadlock_tcp_test COMMAND pstm_deadlock_tcp_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_tcp_test,CONTAINER_LOC>)
- setup_target_for_coverage(pstm_deadlock_tcp_test SCAN_DIR ..)
-
- #TCP Endpoint test is disabled because the test is not stable when running on Travis
- if (ENABLE_PUBSUB_PSA_TCP_ENDPOINT_TEST)
- add_test(NAME pubsub_tcp_endpoint_tests COMMAND pubsub_tcp_endpoint_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_endpoint_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_tcp_endpoint_tests SCAN_DIR ..)
- endif()
-
# TCP v2 tests
add_celix_container(pubsub_tcp_v2_wire_v1_tests
@@ -444,57 +321,6 @@ if (BUILD_PUBSUB_PSA_TCP)
endif()
if (BUILD_PUBSUB_PSA_WS)
- add_celix_container(pubsub_websocket_tests
- USE_CONFIG
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- USE_WEBSOCKETS=true
- LISTENING_PORTS=8080
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::http_admin
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_websocket
- pubsub_sut
- pubsub_tst
- )
- target_link_libraries(pubsub_websocket_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi civetweb_shared GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_websocket_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_websocket_tests COMMAND pubsub_websocket_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_websocket_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_websocket_tests SCAN_DIR ..)
-
- add_celix_container(pstm_deadlock_websocket_test
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/pstm_deadlock_test/test_runner.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_websocket
- Celix::shell
- Celix::shell_tui
- )
- target_compile_definitions(pstm_deadlock_websocket_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
- target_link_libraries(pstm_deadlock_websocket_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Jansson Celix::dfi civetweb_shared)
- target_include_directories(pstm_deadlock_websocket_test SYSTEM PRIVATE pstm_deadlock_websocket_test)
-
- #Note we do not link to bundles, as result (to ensure a bundle zip file is created) an dependency on the bundle is needed.
- add_dependencies(pstm_deadlock_websocket_test pubsub_deadlock_sut_bundle)
-
- #Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
-
- add_test(NAME pstm_deadlock_websocket_test COMMAND pstm_deadlock_websocket_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_websocket_test,CONTAINER_LOC>)
- setup_target_for_coverage(pstm_deadlock_websocket_test SCAN_DIR ..)
-
add_celix_container(pubsub_websocket_v2_tests
USE_CONFIG
LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
@@ -541,8 +367,8 @@ if (BUILD_PUBSUB_PSA_WS)
add_dependencies(pstm_deadlock_websocket_v2_test pubsub_deadlock_sut_bundle)
#Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_v2_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_v2_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_v2_test/META-INF/descriptors/msg.descriptor COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_v2_test/META-INF/topics/pub/deadlock.properties COPYONLY)
add_test(NAME pstm_deadlock_websocket_v2_test COMMAND pstm_deadlock_websocket_v2_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_websocket_v2_test,CONTAINER_LOC>)
setup_target_for_coverage(pstm_deadlock_websocket_v2_test SCAN_DIR ..)
@@ -552,23 +378,6 @@ if (BUILD_PUBSUB_PSA_ZMQ)
find_package(ZMQ REQUIRED)
find_package(CZMQ REQUIRED)
- add_celix_container(pubsub_zmq_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v1
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_zmq
- pubsub_sut
- pubsub_tst
- pubsub_serializer
- )
-
add_celix_container(pubsub_zmq_v2_tests
USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
@@ -586,59 +395,11 @@ if (BUILD_PUBSUB_PSA_ZMQ)
pubsub_serializer
)
- target_link_libraries(pubsub_zmq_tests PRIVATE Celix::pubsub_api Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_zmq_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_zmq_tests COMMAND pubsub_zmq_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_zmq_tests SCAN_DIR ..)
-
target_link_libraries(pubsub_zmq_v2_tests PRIVATE Celix::pubsub_api Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
target_include_directories(pubsub_zmq_v2_tests SYSTEM PRIVATE gtest)
add_test(NAME pubsub_zmq_v2_tests COMMAND pubsub_zmq_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_v2_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_zmq_v2_tests SCAN_DIR ..)
- add_celix_container(pubsub_zmq_wire_v2_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_zmq
- pubsub_sut
- pubsub_tst
- pubsub_serializer
- )
-
- target_link_libraries(pubsub_zmq_wire_v2_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_zmq_wire_v2_tests SYSTEM PRIVATE gtest)
- add_test(NAME pubsub_zmq_wire_v2_tests COMMAND pubsub_zmq_wire_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_wire_v2_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_zmq_wire_v2_tests SCAN_DIR ..)
-
-
- add_celix_container(pubsub_zmq_zerocopy_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- PSA_ZMQ_ZEROCOPY_ENABLED=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v1
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_zmq
- Celix::shell
- Celix::shell_tui
- pubsub_sut
- pubsub_tst
- pubsub_serializer
- )
-
add_celix_container(pubsub_zmq_v2_zerocopy_tests
USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
@@ -658,11 +419,6 @@ if (BUILD_PUBSUB_PSA_ZMQ)
pubsub_tst
pubsub_serializer
)
- target_link_libraries(pubsub_zmq_zerocopy_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_zmq_zerocopy_tests SYSTEM PRIVATE gtest)
-
- add_test(NAME pubsub_zmq_zerocopy_tests COMMAND pubsub_zmq_zerocopy_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_zerocopy_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_zmq_zerocopy_tests SCAN_DIR ..)
target_link_libraries(pubsub_zmq_v2_zerocopy_tests PRIVATE Celix::pubsub_api Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
target_include_directories(pubsub_zmq_v2_zerocopy_tests SYSTEM PRIVATE gtest)
@@ -670,48 +426,6 @@ if (BUILD_PUBSUB_PSA_ZMQ)
add_test(NAME pubsub_zmq_v2_zerocopy_tests COMMAND pubsub_zmq_v2_zerocopy_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_v2_zerocopy_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_zmq_v2_zerocopy_tests SCAN_DIR ..)
- add_celix_container(pubsub_zmq_zerocopy_wire_v2_tests
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/gtest/PubSubIntegrationTestSuite.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- PSA_ZMQ_ZEROCOPY_ENABLED=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_zmq
- Celix::shell
- Celix::shell_tui
- pubsub_sut
- pubsub_tst
- pubsub_serializer
- )
- target_link_libraries(pubsub_zmq_zerocopy_wire_v2_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi ZMQ::lib CZMQ::lib GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_zmq_zerocopy_wire_v2_tests SYSTEM PRIVATE gtest)
-
- add_test(NAME pubsub_zmq_zerocopy_wire_v2_tests COMMAND pubsub_zmq_zerocopy_wire_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_zerocopy_wire_v2_tests,CONTAINER_LOC>)
- setup_target_for_coverage(pubsub_zmq_zerocopy_wire_v2_tests SCAN_DIR ..)
-
- add_celix_container(pstm_deadlock_zmq_test
- USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
- LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/pstm_deadlock_test/test_runner.cc
- DIR ${CMAKE_CURRENT_BINARY_DIR}
- PROPERTIES
- LOGHELPER_STDOUT_FALLBACK_INCLUDE_DEBUG=true
- CELIX_LOGGING_DEFAULT_ACTIVE_LOG_LEVEL=trace
- BUNDLES
- Celix::celix_pubsub_serializer_json
- Celix::celix_pubsub_protocol_wire_v2
- Celix::celix_pubsub_topology_manager
- Celix::celix_pubsub_admin_zmq
- Celix::shell
- Celix::shell_tui
- )
-
-
add_celix_container(pstm_deadlock_zmq_v2_test
USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
LAUNCHER_SRC ${CMAKE_CURRENT_LIST_DIR}/pstm_deadlock_test/test_runner.cc
@@ -725,19 +439,6 @@ if (BUILD_PUBSUB_PSA_ZMQ)
Celix::celix_pubsub_admin_zmq_v2
Celix::celix_pubsub_protocol_wire_v2
)
- target_compile_definitions(pstm_deadlock_zmq_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
- target_link_libraries(pstm_deadlock_zmq_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::dfi ZMQ::lib CZMQ::lib)
- target_include_directories(pstm_deadlock_zmq_test SYSTEM PRIVATE pstm_deadlock_zmq_test)
-
- #Note we do not link to bundles, as result (to ensure a bundle zip file is created) an dependency on the bundle is needed.
- add_dependencies(pstm_deadlock_zmq_test pubsub_deadlock_sut_bundle)
-
- #Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
-
- add_test(NAME pstm_deadlock_zmq_test COMMAND pstm_deadlock_zmq_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_zmq_test,CONTAINER_LOC>)
- setup_target_for_coverage(pstm_deadlock_zmq_test SCAN_DIR ..)
target_compile_definitions(pstm_deadlock_zmq_v2_test PRIVATE -DDEADLOCK_SUT_BUNDLE_FILE=\"${DEADLOCK_SUT_BUNDLE_FILE}\")
target_link_libraries(pstm_deadlock_zmq_v2_test PRIVATE Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::dfi ZMQ::lib CZMQ::lib)
@@ -747,8 +448,8 @@ if (BUILD_PUBSUB_PSA_ZMQ)
add_dependencies(pstm_deadlock_zmq_v2_test pubsub_deadlock_sut_bundle)
#Framework "bundle" has no cache dir. Default as "cache dir" the cwd is used.
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_v2_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_v2_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_v2_test/META-INF/descriptors/msg.descriptor COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_v2_test/META-INF/topics/pub/deadlock.properties COPYONLY)
add_test(NAME pstm_deadlock_zmq_v2_test COMMAND pstm_deadlock_zmq_v2_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_zmq_v2_test,CONTAINER_LOC>)
setup_target_for_coverage(pstm_deadlock_zmq_v2_test SCAN_DIR ..)