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/07/27 17:53:24 UTC
[celix] 02/02: Moves some test code to a gtest folder,
so that coverage will skips these
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/pubsub-interceptor-fix
in repository https://gitbox.apache.org/repos/asf/celix.git
commit b29d587d5bbf0db5399025b3886809d252956ae1
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Tue Jul 27 19:52:47 2021 +0200
Moves some test code to a gtest folder, so that coverage will skips these
---
bundles/pubsub/integration/CMakeLists.txt | 86 +++++++++++-----------
.../{src => gtest}/loopback_activator.c | 0
bundles/pubsub/integration/{src => gtest}/msg.h | 0
.../{src => gtest}/receive_count_service.h | 0
.../{src => gtest}/serializer_activator.cc | 0
.../integration/{src => gtest}/sut_activator.c | 0
.../{src => gtest}/sut_endpoint_activator.c | 0
.../integration/{src => gtest}/tst_activator.c | 0
.../{src => gtest}/tst_endpoint_activator.c | 0
9 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/bundles/pubsub/integration/CMakeLists.txt b/bundles/pubsub/integration/CMakeLists.txt
index eaefde9..59207a7 100644
--- a/bundles/pubsub/integration/CMakeLists.txt
+++ b/bundles/pubsub/integration/CMakeLists.txt
@@ -20,10 +20,10 @@ find_package(Jansson REQUIRED)
add_celix_bundle(pubsub_endpoint_sut
#"Vanilla" bundle which is under test
SOURCES
- src/sut_endpoint_activator.c
+ gtest/sut_endpoint_activator.c
VERSION 1.0.0
)
-target_include_directories(pubsub_endpoint_sut PRIVATE src)
+target_include_directories(pubsub_endpoint_sut PRIVATE gtest)
target_link_libraries(pubsub_endpoint_sut PRIVATE Celix::pubsub_api)
celix_bundle_files(pubsub_endpoint_sut
meta_data/msg.descriptor
@@ -37,7 +37,7 @@ celix_bundle_files(pubsub_endpoint_sut
add_celix_bundle(pubsub_endpoint_tst
#Test bundle containing cpputests and uses celix_test_runner launcher instead of the celix launcher
SOURCES
- src/tst_endpoint_activator.c
+ gtest/tst_endpoint_activator.c
VERSION 1.0.0
)
target_link_libraries(pubsub_endpoint_tst PRIVATE Celix::framework Celix::pubsub_api)
@@ -54,10 +54,10 @@ celix_bundle_files(pubsub_endpoint_tst
add_celix_bundle(pubsub_loopback
#"Vanilla" bundle which is under test
SOURCES
- src/loopback_activator.c
+ gtest/loopback_activator.c
VERSION 1.0.0
)
-target_include_directories(pubsub_loopback PRIVATE src)
+target_include_directories(pubsub_loopback PRIVATE gtest)
target_link_libraries(pubsub_loopback PRIVATE Celix::pubsub_api)
celix_bundle_files(pubsub_loopback
meta_data/msg.descriptor
@@ -75,10 +75,10 @@ celix_bundle_files(pubsub_loopback
add_celix_bundle(pubsub_sut
#"Vanilla" bundle which is under test
SOURCES
- src/sut_activator.c
+ gtest/sut_activator.c
VERSION 1.0.0
)
-target_include_directories(pubsub_sut PRIVATE src)
+target_include_directories(pubsub_sut PRIVATE gtest)
target_link_libraries(pubsub_sut PRIVATE Celix::pubsub_api)
celix_bundle_files(pubsub_sut
meta_data/msg.descriptor
@@ -92,7 +92,7 @@ celix_bundle_files(pubsub_sut
add_celix_bundle(pubsub_tst
#Test bundle containing cpputests and uses celix_test_runner launcher instead of the celix launcher
SOURCES
- src/tst_activator.c
+ gtest/tst_activator.c
VERSION 1.0.0
)
target_link_libraries(pubsub_tst PRIVATE Celix::framework Celix::pubsub_api)
@@ -108,7 +108,7 @@ celix_bundle_files(pubsub_tst
add_celix_bundle(pubsub_deadlock_sut
#"Vanilla" bundle which is used to trigger a publisher added call
SOURCES
- src/sut_activator.c
+ gtest/sut_activator.c
VERSION 1.0.0
)
celix_bundle_files(pubsub_deadlock_sut
@@ -130,10 +130,10 @@ celix_get_bundle_file(pubsub_deadlock_sut DEADLOCK_SUT_BUNDLE_FILE)
add_celix_bundle(pubsub_serializer
#serializer bundle
SOURCES
- src/serializer_activator.cc
+ gtest/serializer_activator.cc
VERSION 1.0.0
)
-target_include_directories(pubsub_serializer PRIVATE src)
+target_include_directories(pubsub_serializer PRIVATE gtest)
target_link_libraries(pubsub_serializer PRIVATE Celix::pubsub_api Celix::pubsub_spi)
if (BUILD_PUBSUB_PSA_UDP_MC)
@@ -152,7 +152,7 @@ if (BUILD_PUBSUB_PSA_UDP_MC)
pubsub_tst
)
target_link_libraries(pubsub_udpmc_tests PRIVATE Celix::pubsub_api Jansson Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_udpmc_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_udpmc_tests SYSTEM PRIVATE gtest)
add_celix_container(pstm_deadlock_udpmc_test
USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
@@ -177,8 +177,8 @@ if (BUILD_PUBSUB_PSA_UDP_MC)
add_dependencies(pstm_deadlock_udpmc_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_udpmc_src/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_udpmc_src/META-INF/topics/pub/deadlock.properties COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/msg.descriptor ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_udpmc_gtest/META-INF/descriptors/msg.descriptor COPYONLY)
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_udpmc_gtest/META-INF/topics/pub/deadlock.properties COPYONLY)
add_test(NAME pstm_deadlock_udpmc_test COMMAND pstm_deadlock_udpmc_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_udpmc_test,CONTAINER_LOC>)
setup_target_for_coverage(pstm_deadlock_udpmc_test SCAN_DIR ..)
@@ -207,7 +207,7 @@ if (BUILD_PUBSUB_PSA_TCP)
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 src)
+ 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 ..)
@@ -229,7 +229,7 @@ if (BUILD_PUBSUB_PSA_TCP)
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 src)
+ 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 ..)
@@ -252,7 +252,7 @@ if (BUILD_PUBSUB_PSA_TCP)
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 src)
+ 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 ..)
@@ -275,7 +275,7 @@ if (BUILD_PUBSUB_PSA_TCP)
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 src)
+ 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.
@@ -300,8 +300,8 @@ if (BUILD_PUBSUB_PSA_TCP)
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_src/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_tcp_src/META-INF/topics/pub/deadlock.properties COPYONLY)
+ 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 ..)
@@ -333,7 +333,7 @@ if (BUILD_PUBSUB_PSA_TCP)
pubsub_serializer
)
target_link_libraries(pubsub_tcp_v2_wire_v1_tests PRIVATE Celix::pubsub_api Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_v2_wire_v1_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_tcp_v2_wire_v1_tests SYSTEM PRIVATE gtest)
add_test(NAME pubsub_tcp_v2_wire_v1_tests COMMAND pubsub_tcp_v2_wire_v1_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_v2_wire_v1_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_tcp_v2_wire_v1_tests SCAN_DIR ..)
@@ -356,7 +356,7 @@ if (BUILD_PUBSUB_PSA_TCP)
pubsub_serializer
)
target_link_libraries(pubsub_tcp_v2_wire_v2_tests PRIVATE Celix::pubsub_api Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_v2_wire_v2_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_tcp_v2_wire_v2_tests SYSTEM PRIVATE gtest)
add_test(NAME pubsub_tcp_v2_wire_v2_tests COMMAND pubsub_tcp_v2_wire_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_v2_wire_v2_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_tcp_v2_wire_v2_tests SCAN_DIR ..)
@@ -380,7 +380,7 @@ if (BUILD_PUBSUB_PSA_TCP)
pubsub_serializer
)
target_link_libraries(pubsub_tcp_v2_wire_v2_with_no_scope_tests PRIVATE Celix::pubsub_api Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_v2_wire_v2_with_no_scope_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_tcp_v2_wire_v2_with_no_scope_tests SYSTEM PRIVATE gtest)
add_test(NAME pubsub_tcp_v2_wire_v2_with_no_scope_tests COMMAND pubsub_tcp_v2_wire_v2_with_no_scope_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_tcp_v2_wire_v2_with_no_scope_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_tcp_v2_wire_v2_with_no_scope_tests SCAN_DIR ..)
@@ -404,7 +404,7 @@ if (BUILD_PUBSUB_PSA_TCP)
pubsub_serializer
)
target_link_libraries(pubsub_tcp_v2_endpoint_tests PRIVATE Celix::pubsub_api Celix::dfi GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_tcp_v2_endpoint_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_tcp_v2_endpoint_tests SYSTEM PRIVATE gtest)
add_celix_container(pstm_deadlock_tcp_v2_test
USE_CONFIG #ensures that a config.properties will be created with the launch bundles.
@@ -430,8 +430,8 @@ if (BUILD_PUBSUB_PSA_TCP)
add_dependencies(pstm_deadlock_tcp_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_tcp_src/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_tcp_src/META-INF/topics/pub/deadlock.properties COPYONLY)
+ 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_v2_test COMMAND pstm_deadlock_tcp_v2_test WORKING_DIRECTORY $<TARGET_PROPERTY:pstm_deadlock_tcp_v2_test,CONTAINER_LOC>)
setup_target_for_coverage(pstm_deadlock_tcp_v2_test SCAN_DIR ..)
@@ -462,7 +462,7 @@ if (BUILD_PUBSUB_PSA_WS)
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 src)
+ 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 ..)
@@ -489,8 +489,8 @@ if (BUILD_PUBSUB_PSA_WS)
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_src/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_websocket_src/META-INF/topics/pub/deadlock.properties COPYONLY)
+ 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 ..)
@@ -514,7 +514,7 @@ if (BUILD_PUBSUB_PSA_WS)
pubsub_serializer
)
target_link_libraries(pubsub_websocket_v2_tests PRIVATE Celix::pubsub_api Jansson civetweb_shared GTest::gtest GTest::gtest_main)
- target_include_directories(pubsub_websocket_v2_tests SYSTEM PRIVATE src)
+ target_include_directories(pubsub_websocket_v2_tests SYSTEM PRIVATE gtest)
add_test(NAME pubsub_websocket_v2_tests COMMAND pubsub_websocket_v2_tests WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_websocket_v2_tests,CONTAINER_LOC>)
setup_target_for_coverage(pubsub_websocket_v2_tests SCAN_DIR ..)
@@ -541,8 +541,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_src/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_src/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_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)
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 ..)
@@ -587,12 +587,12 @@ if (BUILD_PUBSUB_PSA_ZMQ)
)
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 src)
+ 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 src)
+ 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 ..)
@@ -614,7 +614,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
)
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 src)
+ 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 ..)
@@ -659,13 +659,13 @@ if (BUILD_PUBSUB_PSA_ZMQ)
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 src)
+ 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 src)
+ target_include_directories(pubsub_zmq_v2_zerocopy_tests SYSTEM PRIVATE gtest)
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 ..)
@@ -690,7 +690,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
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 src)
+ 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 ..)
@@ -733,8 +733,8 @@ if (BUILD_PUBSUB_PSA_ZMQ)
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_src/META-INF/descriptors/msg.descriptor COPYONLY)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/meta_data/deadlock.scope.properties ${CMAKE_CURRENT_BINARY_DIR}/pstm_deadlock_zmq_src/META-INF/topics/pub/deadlock.properties COPYONLY)
+ 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 ..)
@@ -747,8 +747,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_src/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_src/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_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)
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 ..)
@@ -800,7 +800,7 @@ function(add_celix_interceptors_test_for_psa_and_wire)
gtest/PubSubInterceptorTestSuite.cc
)
target_link_libraries(${TEST_TARGET_NAME} PRIVATE Celix::framework Celix::pubsub_api GTest::gtest GTest::gtest_main Celix::pubsub_spi)
- target_include_directories(${TEST_TARGET_NAME} PRIVATE src)
+ target_include_directories(${TEST_TARGET_NAME} PRIVATE gtest)
add_test(NAME ${TEST_TARGET_NAME} COMMAND ${TEST_TARGET_NAME})
setup_target_for_coverage(${TEST_TARGET_NAME} SCAN_DIR ..)
diff --git a/bundles/pubsub/integration/src/loopback_activator.c b/bundles/pubsub/integration/gtest/loopback_activator.c
similarity index 100%
rename from bundles/pubsub/integration/src/loopback_activator.c
rename to bundles/pubsub/integration/gtest/loopback_activator.c
diff --git a/bundles/pubsub/integration/src/msg.h b/bundles/pubsub/integration/gtest/msg.h
similarity index 100%
rename from bundles/pubsub/integration/src/msg.h
rename to bundles/pubsub/integration/gtest/msg.h
diff --git a/bundles/pubsub/integration/src/receive_count_service.h b/bundles/pubsub/integration/gtest/receive_count_service.h
similarity index 100%
rename from bundles/pubsub/integration/src/receive_count_service.h
rename to bundles/pubsub/integration/gtest/receive_count_service.h
diff --git a/bundles/pubsub/integration/src/serializer_activator.cc b/bundles/pubsub/integration/gtest/serializer_activator.cc
similarity index 100%
rename from bundles/pubsub/integration/src/serializer_activator.cc
rename to bundles/pubsub/integration/gtest/serializer_activator.cc
diff --git a/bundles/pubsub/integration/src/sut_activator.c b/bundles/pubsub/integration/gtest/sut_activator.c
similarity index 100%
rename from bundles/pubsub/integration/src/sut_activator.c
rename to bundles/pubsub/integration/gtest/sut_activator.c
diff --git a/bundles/pubsub/integration/src/sut_endpoint_activator.c b/bundles/pubsub/integration/gtest/sut_endpoint_activator.c
similarity index 100%
rename from bundles/pubsub/integration/src/sut_endpoint_activator.c
rename to bundles/pubsub/integration/gtest/sut_endpoint_activator.c
diff --git a/bundles/pubsub/integration/src/tst_activator.c b/bundles/pubsub/integration/gtest/tst_activator.c
similarity index 100%
rename from bundles/pubsub/integration/src/tst_activator.c
rename to bundles/pubsub/integration/gtest/tst_activator.c
diff --git a/bundles/pubsub/integration/src/tst_endpoint_activator.c b/bundles/pubsub/integration/gtest/tst_endpoint_activator.c
similarity index 100%
rename from bundles/pubsub/integration/src/tst_endpoint_activator.c
rename to bundles/pubsub/integration/gtest/tst_endpoint_activator.c