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 2019/01/07 20:12:07 UTC
[celix] 19/22: CELIX-438: Fixes some test setup
This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx
in repository https://gitbox.apache.org/repos/asf/celix.git
commit 20b047dcbba38e36708608805630d90c201c1e00
Author: Pepijn Noltes <pe...@gmail.com>
AuthorDate: Mon Jan 7 17:02:10 2019 +0100
CELIX-438: Fixes some test setup
---
bundles/pubsub/mock/CMakeLists.txt | 16 +++++++++-------
bundles/shell/cxx_shell_tui/gtest/CMakeLists.txt | 2 +-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/bundles/pubsub/mock/CMakeLists.txt b/bundles/pubsub/mock/CMakeLists.txt
index c310e1b..f77b2cd 100644
--- a/bundles/pubsub/mock/CMakeLists.txt
+++ b/bundles/pubsub/mock/CMakeLists.txt
@@ -28,14 +28,16 @@ if (CPPUTEST_FOUND)
${CPPUTEST_INCLUDE_DIR}
)
+
if (ENABLE_TESTING)
- add_executable(pubsubmock_test
- tst/pubsubmock_test.cc
- tst/run_tests.cc
- )
- target_include_directories(pubsubmock_test PRIVATE ${CMAKE_CURRENT_LIST_DIR}/api)
- target_link_libraries(pubsubmock_test PRIVATE Celix::pubsub_api pubsub_mock ${CPPUTEST_LIBRARY} ${CPPUTEST_EXT_LIBRARY} Celix::framework)
- add_test(NAME pubsubmock_test COMMAND pubsubmock_test)
+ #disabling cpputest based tests
+# add_executable(pubsubmock_test
+# tst/pubsubmock_test.cc
+# tst/run_tests.cc
+# )
+# target_include_directories(pubsubmock_test PRIVATE ${CMAKE_CURRENT_LIST_DIR}/api)
+# target_link_libraries(pubsubmock_test PRIVATE Celix::pubsub_api pubsub_mock ${CPPUTEST_LIBRARY} ${CPPUTEST_EXT_LIBRARY} Celix::framework)
+# add_test(NAME pubsubmock_test COMMAND pubsubmock_test)
endif()
endif()
diff --git a/bundles/shell/cxx_shell_tui/gtest/CMakeLists.txt b/bundles/shell/cxx_shell_tui/gtest/CMakeLists.txt
index 7626eb5..710af05 100644
--- a/bundles/shell/cxx_shell_tui/gtest/CMakeLists.txt
+++ b/bundles/shell/cxx_shell_tui/gtest/CMakeLists.txt
@@ -20,7 +20,7 @@ set(SOURCES
src/ShellTui_tests.cc
)
add_executable(celix_cxx_shell_tui_tests ${SOURCES})
-target_link_libraries(celix_cxx_shell_tui_tests PRIVATE gtest celix_framework_cxx shell_tui_static celix_cxx_shell_api)
+target_link_libraries(celix_cxx_shell_tui_tests PRIVATE gtest celix_framework_cxx shell_tui_static celix_cxx_shell_api glog::glog)
add_test(NAME celix_cxx_shell_tui_tests COMMAND celix_cxx_shell_tui_tests)
SETUP_TARGET_FOR_COVERAGE(celix_cxx_shell_tui_tests_cov celix_cxx_shell_tui_tests ${CMAKE_BINARY_DIR}/coverage/celix_cxx_shell_tui_tests/celix_cxx_shell_tui_tests ..)
\ No newline at end of file