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 9deecd86d9c79728536360911219cdcd5ca4b0b7 Author: Pepijn Noltes <[email protected]> AuthorDate: Mon Jan 7 16:44:42 2019 +0100 CELIX-438: Disabling cpputest based tests, so that the cpputest dep can be removed and the coverage only shows the cxx implementation coverage --- .travis.yml | 4 ---- bundles/pubsub/CMakeLists.txt | 7 ++++--- bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt | 2 +- bundles/remote_services/topology_manager/CMakeLists.txt | 3 ++- libs/dfi/CMakeLists.txt | 3 ++- libs/framework/CMakeLists.txt | 6 +++--- libs/utils/CMakeLists.txt | 3 ++- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3c0f470..843e946 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,10 +44,6 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi zeromq czmq glog cpputest jansson && brew link --force libffi; fi before_script: - - wget https://github.com/cpputest/cpputest/releases/download/v3.8/cpputest-3.8.tar.gz -O /tmp/cpputest.tar.gz - - tar -xzvf /tmp/cpputest.tar.gz -C /tmp - - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd - - - cd /tmp/cpputest-* && ./configure --prefix=/usr/local && make && sudo make install && cd - - mkdir build install - export BUILD_OPTIONS=" \ -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON \ diff --git a/bundles/pubsub/CMakeLists.txt b/bundles/pubsub/CMakeLists.txt index e3db995..ee3ad8b 100644 --- a/bundles/pubsub/CMakeLists.txt +++ b/bundles/pubsub/CMakeLists.txt @@ -36,9 +36,10 @@ if (PUBSUB) add_subdirectory(examples) - if (ENABLE_TESTING) - option(BUILD_PUBSUB_TESTS "Enable Tests for PUBSUB" OFF) - endif() + #if (ENABLE_TESTING) + # option(BUILD_PUBSUB_TESTS "Enable Tests for PUBSUB" OFF) + #endif() + set(BUILD_PUBSUB_TESTS OFF) #disabling all cpputest based tests if (ENABLE_TESTING AND BUILD_PUBSUB_TESTS AND BUILD_PUBSUB_PSA_ZMQ) add_subdirectory(test) endif() diff --git a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt index 480768b..99b9bfd 100644 --- a/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt +++ b/bundles/remote_services/remote_service_admin_dfi/CMakeLists.txt @@ -46,7 +46,7 @@ if (RSA_REMOTE_SERVICE_ADMIN_DFI) ${CURL_LIBRARIES} ${JANSSON_LIBRARIES}) if (ENABLE_TESTING) - add_subdirectory(test) + #add_subdirectory(test) disabling all cpputest based tests endif() diff --git a/bundles/remote_services/topology_manager/CMakeLists.txt b/bundles/remote_services/topology_manager/CMakeLists.txt index 8a4661d..9ee218f 100644 --- a/bundles/remote_services/topology_manager/CMakeLists.txt +++ b/bundles/remote_services/topology_manager/CMakeLists.txt @@ -32,7 +32,8 @@ if (RSA_TOPOLOGY_MANAGER) target_link_libraries(rsa_topology_manager PRIVATE Celix::log_helper Celix::rsa_spi) - if (ENABLE_TESTING) + set(RSA_TESTS OFF) #disabling all cpputest based tests + if (ENABLE_TESTING AND RSA_TESTS) find_package(CppUTest REQUIRED) find_package(Jansson REQUIRED) diff --git a/libs/dfi/CMakeLists.txt b/libs/dfi/CMakeLists.txt index 4451ff7..b738730 100644 --- a/libs/dfi/CMakeLists.txt +++ b/libs/dfi/CMakeLists.txt @@ -50,7 +50,8 @@ install(DIRECTORY include/ DESTINATION include/celix/dfi COMPONENT dfi) #Alias setup to match external usage add_library(Celix::dfi ALIAS dfi) -if (ENABLE_TESTING) +set(DFI_TESTS OFF) #disabling all cpputest based test +if (ENABLE_TESTING AND DFI_TESTS) find_package(CppUTest REQUIRED) include_directories(${CPPUTEST_INCLUDE_DIR}) diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt index 812b4e6..d5a48d8 100644 --- a/libs/framework/CMakeLists.txt +++ b/libs/framework/CMakeLists.txt @@ -66,13 +66,13 @@ install(DIRECTORY include/ DESTINATION include/celix COMPONENT framework) add_library(Celix::framework ALIAS framework) -if (ENABLE_TESTING) +#celix_subproject(FRAMEWORK_TESTS "Option to build the framework tests" "OFF" DEPS) +set(FRAMEWORK_TESTS OFF) #disabling all cpputest based test +if (ENABLE_TESTING AND FRAMEWORK_TESTS) find_package(CppUTest REQUIRED) include_directories(${CPPUTEST_INCLUDE_DIR}) add_subdirectory(tst) endif() - -celix_subproject(FRAMEWORK_TESTS "Option to build the framework tests" "OFF" DEPS) if (ENABLE_TESTING AND FRAMEWORK_TESTS) find_package(CppUTest REQUIRED) diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt index e0afe41..3a695e9 100644 --- a/libs/utils/CMakeLists.txt +++ b/libs/utils/CMakeLists.txt @@ -69,7 +69,8 @@ install(DIRECTORY include/ DESTINATION include/celix COMPONENT framework add_library(Celix::utils ALIAS utils) -celix_subproject(UTILS-TESTS "Option to build the utilities library tests" "OFF") +#celix_subproject(UTILS-TESTS "Option to build the utilities library tests" "OFF") +set(UTILS-TEST OFF) #disabling all cpputest based test if (ENABLE_TESTING AND UTILS-TESTS) #find_package(CppUTest REQUIRED)
