[celix] branch master updated (94e0ea4 -> 96e6b1f)
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git. from 94e0ea4 Merge pull request #239 from apache/hotfix/start_bundles_incorrect add 82b2ce6 Fixed uninitialized var. new 96e6b1f Merge pull request #242 from apache/feature/uninitialized_var The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: libs/framework/src/framework.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[celix] branch master updated (a54cda5 -> 94e0ea4)
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git. from a54cda5 Merge pull request #241 from apache/feature/fallback_build_types_targets add 8bd235d Fixes an incorrect loop that installed bundles multiple times add 94e0ea4 Merge pull request #239 from apache/hotfix/start_bundles_incorrect No new revisions were added by this update. Summary of changes: libs/framework/src/framework.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
[celix] 01/01: Merge pull request #242 from apache/feature/uninitialized_var
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 96e6b1f8ed44e25b2050a305e2a24b55571a1bd9 Merge: 94e0ea4 82b2ce6 Author: Pepijn Noltes AuthorDate: Wed May 20 15:13:53 2020 +0200 Merge pull request #242 from apache/feature/uninitialized_var Fixed uninitialized var. libs/framework/src/framework.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[celix] branch master updated (96e6b1f -> 0f2bb47)
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/celix.git. from 96e6b1f Merge pull request #242 from apache/feature/uninitialized_var add 7a63b4a Added explicit linking for zmq and czmq to pubsub tests, so that fixed library paths are used. new 0f2bb47 Merge pull request #243 from apache/feature/explicit_zmq_linking_for_test The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: bundles/pubsub/test/CMakeLists.txt | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
[celix] 01/01: Merge pull request #243 from apache/feature/explicit_zmq_linking_for_test
This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git commit 0f2bb471d9fd5f8aeecfec06f74f41a7fc3093e5 Merge: 96e6b1f 7a63b4a Author: Pepijn Noltes AuthorDate: Wed May 20 15:14:26 2020 +0200 Merge pull request #243 from apache/feature/explicit_zmq_linking_for_test Feature/explicit zmq linking for test bundles/pubsub/test/CMakeLists.txt | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-)
[celix] 01/01: Added explicit linking for zmq and czmq to pubsub tests, so that fixed library paths are used.
This is an automated email from the ASF dual-hosted git repository.
abroekhuis pushed a commit to branch feature/explicit_zmq_linking_for_test
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 7a63b4a818be1261ef6926f4370a087920db624f
Author: Alexander Broekhuis
AuthorDate: Wed May 20 11:43:39 2020 +0200
Added explicit linking for zmq and czmq to pubsub tests, so that fixed
library paths are used.
---
bundles/pubsub/test/CMakeLists.txt | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/bundles/pubsub/test/CMakeLists.txt
b/bundles/pubsub/test/CMakeLists.txt
index e8b35f9..9282aca 100644
--- a/bundles/pubsub/test/CMakeLists.txt
+++ b/bundles/pubsub/test/CMakeLists.txt
@@ -202,6 +202,9 @@ if (BUILD_PUBSUB_PSA_WS)
endif()
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}/test/test_runner.cc
@@ -217,7 +220,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
pubsub_tst
)
-target_link_libraries(pubsub_zmq_tests PRIVATE Celix::pubsub_api
${CppUTest_LIBRARIES} Jansson Celix::dfi)
+target_link_libraries(pubsub_zmq_tests PRIVATE Celix::pubsub_api
${CppUTest_LIBRARIES} Jansson Celix::dfi ZMQ::lib CZMQ::lib)
target_include_directories(pubsub_zmq_tests SYSTEM PRIVATE
${CppUTest_INCLUDE_DIR} test)
add_test(NAME pubsub_zmq_tests COMMAND pubsub_zmq_tests WORKING_DIRECTORY
$)
setup_target_for_coverage(pubsub_zmq_tests SCAN_DIR ..)
@@ -240,7 +243,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
pubsub_sut
pubsub_tst
)
-target_link_libraries(pubsub_zmq_zerocopy_tests PRIVATE Celix::pubsub_api
${CppUTest_LIBRARIES} Jansson Celix::dfi)
+target_link_libraries(pubsub_zmq_zerocopy_tests PRIVATE Celix::pubsub_api
${CppUTest_LIBRARIES} Jansson Celix::dfi ZMQ::lib CZMQ::lib)
target_include_directories(pubsub_zmq_zerocopy_tests SYSTEM PRIVATE
${CppUTest_INCLUDE_DIR} test)
#TODO fix issues with ZeroCopy and reanble test again
[celix] branch feature/explicit_zmq_linking_for_test created (now 7a63b4a)
This is an automated email from the ASF dual-hosted git repository. abroekhuis pushed a change to branch feature/explicit_zmq_linking_for_test in repository https://gitbox.apache.org/repos/asf/celix.git. at 7a63b4a Added explicit linking for zmq and czmq to pubsub tests, so that fixed library paths are used. This branch includes the following new commits: new 7a63b4a Added explicit linking for zmq and czmq to pubsub tests, so that fixed library paths are used. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
