This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/cxx14_framework_support
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/cxx14_framework_support by this push:
new 1d0e1785 Refactor test for cxx11 and cxx14 option name and fix
template specialization issue
1d0e1785 is described below
commit 1d0e1785386b95ec0c68865d9160556251cb803f
Author: Pepijn Noltes <[email protected]>
AuthorDate: Tue Nov 1 20:42:35 2022 +0100
Refactor test for cxx11 and cxx14 option name and fix template
specialization issue
---
.github/workflows/coverage.yml | 4 ++--
.github/workflows/coverity-scan.yml | 4 ++--
.github/workflows/macos-nightly.yml | 4 ++--
.github/workflows/macos.yml | 4 ++--
.github/workflows/ubuntu-nightly.yml | 4 ++--
.github/workflows/ubuntu.yml | 4 ++--
CMakeLists.txt | 4 ++--
conanfile.py | 4 ++++
libs/framework/gtest/CMakeLists.txt | 4 ++--
libs/framework/include/celix/UseServiceBuilder.h | 2 +-
libs/utils/gtest/CMakeLists.txt | 2 +-
libs/utils/include/celix/Properties.h | 4 +---
12 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index f3597947..26295301 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -33,8 +33,8 @@ jobs:
-DENABLE_CODE_COVERAGE=ON
-DBUILD_EXPERIMENTAL=ON
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
run: |
mkdir build
cd build
diff --git a/.github/workflows/coverity-scan.yml
b/.github/workflows/coverity-scan.yml
index 8e817e31..a159baa6 100644
--- a/.github/workflows/coverity-scan.yml
+++ b/.github/workflows/coverity-scan.yml
@@ -40,8 +40,8 @@ jobs:
-DENABLE_TESTING=ON
-DCMAKE_BUILD_TYPE=Debug
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
run: |
cd build
cmake ${BUILD_OPTIONS} ..
diff --git a/.github/workflows/macos-nightly.yml
b/.github/workflows/macos-nightly.yml
index 6ca4191e..56352880 100644
--- a/.github/workflows/macos-nightly.yml
+++ b/.github/workflows/macos-nightly.yml
@@ -28,8 +28,8 @@ jobs:
-DENABLE_TESTING=ON
-DENABLE_ADDRESS_SANITIZER=ON
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
run: |
mkdir build install
cd build
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b14634ee..0921585d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -26,8 +26,8 @@ jobs:
-DENABLE_TESTING=ON
-DENABLE_ADDRESS_SANITIZER=ON
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
run: |
mkdir build install
cd build
diff --git a/.github/workflows/ubuntu-nightly.yml
b/.github/workflows/ubuntu-nightly.yml
index 8a66c85d..4b2ff637 100644
--- a/.github/workflows/ubuntu-nightly.yml
+++ b/.github/workflows/ubuntu-nightly.yml
@@ -58,8 +58,8 @@ jobs:
-DENABLE_TESTING=ON
-DBUILD_EXPERIMENTAL=ON
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
BUILD_OPTIONS_SANITIZER: |
-DENABLE_ADDRESS_SANITIZER=ON
BUILD_OPTIONS_V3_API: |
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 7b78569f..416ee438 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -56,8 +56,8 @@ jobs:
-DENABLE_TESTING=ON
-DBUILD_EXPERIMENTAL=ON
-DBUILD_CXX_REMOTE_SERVICE_ADMIN=ON
- -DCELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11=ON
- -DCELIX_TEST_FOR_CXX14=ON
+ -DENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11=ON
+ -DENABLE_TESTING_FOR_CXX14=ON
BUILD_OPTIONS_SANITIZER: |
-DENABLE_ADDRESS_SANITIZER=ON
BUILD_OPTIONS_V3_API: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 575c43e1..ca38c7c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,8 +187,8 @@ endif ()
option(CELIX_USE_ZIP_INSTEAD_OF_JAR "Default Celix cmake command will use jar
to package bundle (if found). This option enforces Celix to use zip instead."
OFF)
option(CELIX_CXX "Build C++ libraries and bundles. Note for tests C++ is
always used." ON)
-option(CELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11 "Test the Dependency Manager
for C++11 support" OFF)
-option(CELIX_TEST_FOR_CXX14 "Test celix utils and framework C++ header for
C++14 support" OFF)
+option(ENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11 "Test the Dependency
Manager for C++11 support" OFF)
+option(ENABLE_TESTING_FOR_CXX14 "Test celix utils and framework C++ header for
C++14 support" OFF)
#Libraries and Launcher
add_subdirectory(libs)
diff --git a/conanfile.py b/conanfile.py
index 65861aa1..c5cb4eef 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -43,6 +43,8 @@ class CelixConan(ConanFile):
"enable_address_sanitizer": [True, False],
"enable_undefined_sanitizer": [True, False],
"enable_thread_sanitizer": [True, False],
+ "enable_testing_dependency_manager_for_cxx11": [True, False],
+ "enable_testing_utils_and_framework_for_cxx14": [True, False],
"celix_add_openssl_dep": [True, False],
"build_all": [True, False],
"build_deployment_admin": [True, False],
@@ -88,6 +90,8 @@ class CelixConan(ConanFile):
"enable_address_sanitizer": False,
"enable_undefined_sanitizer": False,
"enable_thread_sanitizer": False,
+ "enable_testing_dependency_manager_for_cxx11": False,
+ "enable_testing_utils_and_framework_for_cxx14": False,
"celix_add_openssl_dep": False,
"build_all": False,
"build_deployment_admin": False,
diff --git a/libs/framework/gtest/CMakeLists.txt
b/libs/framework/gtest/CMakeLists.txt
index 977fcf99..517695f7 100644
--- a/libs/framework/gtest/CMakeLists.txt
+++ b/libs/framework/gtest/CMakeLists.txt
@@ -96,7 +96,7 @@ target_compile_definitions(test_framework PRIVATE
add_test(NAME test_framework COMMAND test_framework)
setup_target_for_coverage(test_framework SCAN_DIR ..)
-if (CELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11)
+if (ENABLE_TESTING_DEPENDENCY_MANAGER_FOR_CXX11)
#Setting standard to C++11 and testing C++ dependency manager to ensure
that this still support C++11.
#This ensure that the C++11 dependency manager is backwards compatible
with Celix 2.2.1
set(CMAKE_CXX_STANDARD 11)
@@ -115,7 +115,7 @@ if (CELIX_TEST_DEPENDENCY_MANAGER_FOR_CXX11)
add_celix_bundle(test_dep_man_bundle_activator_with_cxx11 SOURCES
src/HelloWorldCxxActivatorWithDepMan.cc VERSION 1.0.0)
endif ()
-if (CELIX_TEST_FOR_CXX14)
+if (ENABLE_TESTING_FOR_CXX14)
#Setting standard to C++14 and testing the C++ framework headers to ensure
that C++14 is also supported.
set(CMAKE_CXX_STANDARD 14)
diff --git a/libs/framework/include/celix/UseServiceBuilder.h
b/libs/framework/include/celix/UseServiceBuilder.h
index 6aa8aa24..69648f34 100644
--- a/libs/framework/include/celix/UseServiceBuilder.h
+++ b/libs/framework/include/celix/UseServiceBuilder.h
@@ -52,7 +52,7 @@ namespace celix {
friend class BundleContext;
//NOTE private to prevent move so that a build() call cannot be
forgotten
- UseServiceBuilder(UseServiceBuilder&&) noexcept = default;
+ UseServiceBuilder(UseServiceBuilder&&) = default;
public:
explicit UseServiceBuilder(std::shared_ptr<celix_bundle_context_t>
_cCtx, std::string _name, bool _useSingleService = true) :
cCtx{std::move(_cCtx)},
diff --git a/libs/utils/gtest/CMakeLists.txt b/libs/utils/gtest/CMakeLists.txt
index 466002dc..0965d257 100644
--- a/libs/utils/gtest/CMakeLists.txt
+++ b/libs/utils/gtest/CMakeLists.txt
@@ -69,7 +69,7 @@ endif ()
add_test(NAME test_utils COMMAND test_utils)
setup_target_for_coverage(test_utils SCAN_DIR ..)
-if (CELIX_TEST_FOR_CXX14)
+if (ENABLE_TESTING_FOR_CXX14)
#Setting standard to C++14 and testing C++ Properties.h, Filter.h and
Utils.h to ensure that C++14 is supported.
set(CMAKE_CXX_STANDARD 14)
add_executable(test_utils_cxx_headers_with_cxx14
diff --git a/libs/utils/include/celix/Properties.h
b/libs/utils/include/celix/Properties.h
index 6af04f82..05032328 100644
--- a/libs/utils/include/celix/Properties.h
+++ b/libs/utils/include/celix/Properties.h
@@ -369,9 +369,7 @@ namespace celix {
/**
* @brief Sets a const char* property.
*/
- template<>
- void set<const char*>(const std::string& key, const char* value) {
- using namespace std;
+ void set(const std::string& key, const char* value) {
celix_properties_set(cProps.get(), key.c_str(), value);
}
#endif
