Adds Debug build type option to travis config to ensure the current -O optimilization for testing
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/326f2759 Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/326f2759 Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/326f2759 Branch: refs/heads/develop Commit: 326f27594c8d36a72f6fd0cb81c76c7da3ce382d Parents: 49d0e35 Author: Pepijn Noltes <[email protected]> Authored: Tue Jan 30 15:58:43 2018 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Tue Jan 30 15:58:43 2018 +0100 ---------------------------------------------------------------------- .travis.yml | 4 ++-- framework/src/service_registration.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/326f2759/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 279e548..5af8c60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,8 +101,8 @@ script: # RSA_SHM is only working on linux, but both compilers (see CELIX-277) - cd build - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$ANDROID" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake -DCMAKE_BUILD_TYPE=Debug ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - if [ -z "$ANDROID" ]; then make all && make deploy && sudo make install; else cd .. && docker build -t celixandroid - < Dockerfile.Android ; fi - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi && make test ARGS="-V"; else docker run celixandroid; fi http://git-wip-us.apache.org/repos/asf/celix/blob/326f2759/framework/src/service_registration.c ---------------------------------------------------------------------- diff --git a/framework/src/service_registration.c b/framework/src/service_registration.c index 5d23dbf..262a104 100644 --- a/framework/src/service_registration.c +++ b/framework/src/service_registration.c @@ -210,7 +210,7 @@ celix_status_t serviceRegistration_ungetService(service_registration_pt registra if (registration->isServiceFactory) { service_factory_pt factory = (void*) registration->serviceFactory; /*NOTE the service argument of the service_factory should be const void**. - To ensure backwards compatability a cast is made instead. + To ensure backwards compatibility a cast is made instead. */ factory->ungetService(factory->handle, bundle, registration, (void**) service); }
