This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-cpputests in repository https://gitbox.apache.org/repos/asf/celix.git
commit 6a4d2a98997f990e93fb02bff98bab0621db5400 Author: Pepijn Noltes <[email protected]> AuthorDate: Sat Dec 23 17:14:13 2023 +0100 Remove cpputest from build config --- .github/workflows/coverage.yml | 2 +- .github/workflows/coverity-scan.yml | 1 - .github/workflows/macos.yml | 4 ++-- .github/workflows/ubuntu.yml | 3 +-- conanfile.py | 3 --- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index e0344419..8ed1777d 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -55,7 +55,7 @@ jobs: -o celix:enable_testing_on_ci=True -o celix:enable_ccache=True run: | - conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=openssl/1.1.1s + conan install . celix/ci -pr:b default -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=openssl/1.1.1s - name: Build run: | conan build . -bf build diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 6baceb7b..37554481 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -27,7 +27,6 @@ jobs: libffi-dev \ libxml2-dev \ libczmq-dev \ - libcpputest-dev \ rapidjson-dev \ libavahi-compat-libdnssd-dev \ libcivetweb-dev \ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 435aac81..fb2b5342 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -59,7 +59,7 @@ jobs: -o celix/*:framework_curlinit=False -o celix/*:enable_ccache=True run: | - conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest + conan build . -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b default -pr:h default -s:b build_type=Release -s:h build_type=Release -of build ${CONAN_BUILD_OPTIONS} -b missing - name: Test run: | cd build @@ -75,7 +75,7 @@ jobs: uses: actions/[email protected] - name: Install dependencies run: | - brew install lcov zeromq czmq cpputest jansson rapidjson libzip ccache + brew install lcov zeromq czmq jansson rapidjson libzip ccache - name: Prepare ccache timestamp id: ccache_cache_timestamp run: | diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index e1bd8ef0..6b47515c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -80,7 +80,7 @@ jobs: -o celix:framework_curlinit=False -o celix:enable_ccache=True run: | - conan install . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing -b cpputest --require-override=openssl/1.1.1s + conan install . celix/ci -c tools.cmake.cmaketoolchain:generator=Ninja -pr:b release -pr:h default -if build ${CONAN_BUILD_OPTIONS} -b missing --require-override=openssl/1.1.1s - name: Build env: CC: ${{ matrix.compiler[0] }} @@ -120,7 +120,6 @@ jobs: libffi-dev \ libxml2-dev \ libczmq-dev \ - libcpputest-dev \ rapidjson-dev \ libavahi-compat-libdnssd-dev \ libcivetweb-dev \ diff --git a/conanfile.py b/conanfile.py index 66a7c8f7..c82d22c5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -156,7 +156,6 @@ class CelixConan(ConanFile): def build_requirements(self): if self.options.enable_testing: self.test_requires("gtest/1.10.0") - self.test_requires("cpputest/4.0") if self.options.enable_ccache: self.build_requires("ccache/4.7.4") @@ -347,8 +346,6 @@ class CelixConan(ConanFile): self.options['openssl'].shared = True if self.options.enable_testing: self.options['gtest'].shared = True - if self.options.enable_address_sanitizer: - self.options["cpputest"].with_leak_detection = False if (self.options.build_rsa_discovery_common or (self.options.build_rsa_remote_service_admin_dfi and self.options.enable_testing)): self.options['libxml2'].shared = True
