celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abroekh...@apache.org
Subject svn commit: r1660591 - in /celix/trunk/framework: CMakeLists.txt private/test/resolver_test.cpp
Date Wed, 18 Feb 2015 11:05:31 GMT
Author: abroekhuis
Date: Wed Feb 18 11:05:30 2015
New Revision: 1660591

URL: http://svn.apache.org/r1660591
Log:
CELIX-219: Updated resolver test to compile after memory fixes previously done.

Modified:
    celix/trunk/framework/CMakeLists.txt
    celix/trunk/framework/private/test/resolver_test.cpp

Modified: celix/trunk/framework/CMakeLists.txt
URL: http://svn.apache.org/viewvc/celix/trunk/framework/CMakeLists.txt?rev=1660591&r1=1660590&r2=1660591&view=diff
==============================================================================
--- celix/trunk/framework/CMakeLists.txt (original)
+++ celix/trunk/framework/CMakeLists.txt Wed Feb 18 11:05:30 2015
@@ -236,7 +236,9 @@ if (FRAMEWORK)
             private/mock/capability_mock.c
             private/mock/module_mock.c
             private/mock/wire_mock.c
-            private/src/resolver.c)
+            private/src/resolver.c
+            private/src/celix_errorcodes.c
+            private/src/celix_log.c)
         target_link_libraries(resolver_test ${CPPUTEST_LIBRARY} ${CPPUTEST_EXT_LIBRARY} celix_utils)
 	    
         add_executable(service_reference_test 

Modified: celix/trunk/framework/private/test/resolver_test.cpp
URL: http://svn.apache.org/viewvc/celix/trunk/framework/private/test/resolver_test.cpp?rev=1660591&r1=1660590&r2=1660591&view=diff
==============================================================================
--- celix/trunk/framework/private/test/resolver_test.cpp (original)
+++ celix/trunk/framework/private/test/resolver_test.cpp Wed Feb 18 11:05:30 2015
@@ -33,6 +33,9 @@
 
 extern "C" {
 #include "resolver.h"
+#include "celix_log.h"
+
+framework_logger_pt logger;
 }
 
 int main(int argc, char** argv) {
@@ -41,6 +44,8 @@ int main(int argc, char** argv) {
 
 TEST_GROUP(resolver) {
 	void setup(void) {
+		logger = (framework_logger_pt) malloc(sizeof(*logger));
+		logger->logFunction = frameworkLogger_log;
 	}
 
 	void teardown() {



Mime
View raw message