celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-454: Small fix for osx compilation
Date Mon, 12 Nov 2018 11:27:43 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-454-pubsub-disc 1df73a01f -> 11472da89


CELIX-454: Small fix for osx compilation


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/11472da8
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/11472da8
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/11472da8

Branch: refs/heads/feature/CELIX-454-pubsub-disc
Commit: 11472da8986f6800d0b2771e47525b81be9596ad
Parents: 1df73a0
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Mon Nov 12 12:27:07 2018 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Mon Nov 12 12:27:07 2018 +0100

----------------------------------------------------------------------
 bundles/log_service/src/log_helper.c        | 2 +-
 libs/framework/private/test/bundle_test.cpp | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/11472da8/bundles/log_service/src/log_helper.c
----------------------------------------------------------------------
diff --git a/bundles/log_service/src/log_helper.c b/bundles/log_service/src/log_helper.c
index a995f07..d558ff5 100644
--- a/bundles/log_service/src/log_helper.c
+++ b/bundles/log_service/src/log_helper.c
@@ -70,7 +70,7 @@ static char* logHelper_backtrace(void) {
 	return result;
 }
 #else
-static void logHelper_logBacktrace(void) {
+static char* logHelper_logBacktrace(void) {
 	return NULL;
 }
 #endif

http://git-wip-us.apache.org/repos/asf/celix/blob/11472da8/libs/framework/private/test/bundle_test.cpp
----------------------------------------------------------------------
diff --git a/libs/framework/private/test/bundle_test.cpp b/libs/framework/private/test/bundle_test.cpp
index 7d99aed..04ec37c 100644
--- a/libs/framework/private/test/bundle_test.cpp
+++ b/libs/framework/private/test/bundle_test.cpp
@@ -912,6 +912,8 @@ TEST(bundle, refresh) {
 	mock().expectOneCall("resolver_addModule")
 			.withParameter("module", module_new);
 
+	mock().ignoreOtherCalls();
+
 	LONGS_EQUAL(CELIX_SUCCESS, bundle_refresh(bundle));
 
 	arrayList_destroy(bundle->modules);


Mime
View raw message