CELIX-387: Updates to cpputest from 3.7 to 3.8 also added needed changes because 3.8 breaks the API from 3.7
Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/2f81c78c Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/2f81c78c Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/2f81c78c Branch: refs/heads/develop Commit: 2f81c78c29e64fdab6e2ec02a418179f89e8f161 Parents: 0d8cd83 Author: Pepijn Noltes <[email protected]> Authored: Mon Nov 21 19:32:50 2016 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Mon Nov 21 19:32:50 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 2 +- framework/private/test/service_registry_test.cpp | 4 ++-- utils/private/test/celix_threads_test.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/2f81c78c/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 5d955b6..b543400 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi cmake && brew link --force libffi; fi before_script: - - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true -O /tmp/cpputest.tar.gz + - 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-3.7.1 && ./configure --prefix=/usr/local && make && sudo make install && cd - - cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr/local && make && sudo make install && cd - http://git-wip-us.apache.org/repos/asf/celix/blob/2f81c78c/framework/private/test/service_registry_test.cpp ---------------------------------------------------------------------- diff --git a/framework/private/test/service_registry_test.cpp b/framework/private/test/service_registry_test.cpp index 87e7998..e65c707 100644 --- a/framework/private/test/service_registry_test.cpp +++ b/framework/private/test/service_registry_test.cpp @@ -78,7 +78,7 @@ static int registry_callback_t_isEqual(const void* object1, const void* object2) callback1.unregister == callback2.unregister; } -static char * registry_callback_t_toString(const void* object) +static const char * registry_callback_t_toString(const void* object) { char buff[512]; registry_callback_t callback = *(registry_callback_t*) object; @@ -91,7 +91,7 @@ static char * registry_callback_t_toString(const void* object) int main(int argc, char** argv) { mock_c()->installComparator("registry_callback_t", registry_callback_t_isEqual, registry_callback_t_toString); int ret = RUN_ALL_TESTS(argc, argv); - mock_c()->removeAllComparators(); + mock_c()->removeAllComparatorsAndCopiers(); return ret; } http://git-wip-us.apache.org/repos/asf/celix/blob/2f81c78c/utils/private/test/celix_threads_test.cpp ---------------------------------------------------------------------- diff --git a/utils/private/test/celix_threads_test.cpp b/utils/private/test/celix_threads_test.cpp index b22ba9d..67d9a7a 100644 --- a/utils/private/test/celix_threads_test.cpp +++ b/utils/private/test/celix_threads_test.cpp @@ -64,7 +64,7 @@ static int celix_thread_t_equals(const void * object, const void * compareTo){ thread1->threadInitialized == thread2->threadInitialized; } -static char * celix_thread_t_toString(const void * object){ +static const char * celix_thread_t_toString(const void * object){ celix_thread_t * thread = (celix_thread_t*) object; char buff[512]; snprintf(buff, 512, "thread: %lu, threadInitialized: %s", (unsigned long)thread->thread, (thread->threadInitialized ? "true" : "false")); @@ -125,7 +125,7 @@ TEST_GROUP(celix_thread_kill) { void teardown(void) { sigaction(SIGUSR1, &sigactold, &sigact); - mock_c()->removeAllComparators(); + mock_c()->removeAllComparatorsAndCopiers(); } };
