celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [06/50] [abbrv] celix git commit: CELIX-237: Some small changes needed for Mac
Date Tue, 13 Oct 2015 10:21:34 GMT
CELIX-237: Some small changes needed for Mac


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

Branch: refs/heads/develop
Commit: 4e3be109d24da30b787a753a00e8462a6f905e52
Parents: 481e5c8
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Sat Aug 1 21:15:51 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Sat Aug 1 21:15:51 2015 +0200

----------------------------------------------------------------------
 .../tst/json_serializer_tests.cpp                         | 10 +++++-----
 .../remote_service_admin_dfi/tst/CMakeLists.txt           |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/4e3be109/remote_services/remote_service_admin_dfi/dynamic_function_interface/tst/json_serializer_tests.cpp
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/dynamic_function_interface/tst/json_serializer_tests.cpp
b/remote_services/remote_service_admin_dfi/dynamic_function_interface/tst/json_serializer_tests.cpp
index c21d594..5ee71ac 100644
--- a/remote_services/remote_service_admin_dfi/dynamic_function_interface/tst/json_serializer_tests.cpp
+++ b/remote_services/remote_service_admin_dfi/dynamic_function_interface/tst/json_serializer_tests.cpp
@@ -49,9 +49,9 @@ struct example1 {
 static void check_example1(void *data) {
     struct example1 *ex = (struct example1 *)data;
     CHECK_EQUAL(1.0, ex->a);
-    CHECK_EQUAL(22, ex->b);
-    CHECK_EQUAL(32, ex->c);
-    CHECK_EQUAL(42, ex->d);
+    LONGS_EQUAL(22, ex->b);
+    LONGS_EQUAL(32, ex->c);
+    LONGS_EQUAL(42, ex->d);
     CHECK_EQUAL(4.4f, ex->e);
 }
 
@@ -79,8 +79,8 @@ struct example2 {
 static void check_example2(void *data) {
     struct example2 *ex = (struct example2 *)data;
     CHECK_EQUAL(42, ex->byte);
-    CHECK_EQUAL(232, ex->long1);
-    CHECK_EQUAL(242, ex->long2);
+    LONGS_EQUAL(232, ex->long1);
+    LONGS_EQUAL(242, ex->long2);
     CHECK_EQUAL(4.2, ex->double1);
     CHECK_EQUAL(3.2f, ex->float1);
     CHECK_EQUAL(4.4, ex->double2);

http://git-wip-us.apache.org/repos/asf/celix/blob/4e3be109/remote_services/remote_service_admin_dfi/tst/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/remote_services/remote_service_admin_dfi/tst/CMakeLists.txt b/remote_services/remote_service_admin_dfi/tst/CMakeLists.txt
index d71186e..a9b7b00 100644
--- a/remote_services/remote_service_admin_dfi/tst/CMakeLists.txt
+++ b/remote_services/remote_service_admin_dfi/tst/CMakeLists.txt
@@ -12,7 +12,7 @@ include_directories(
 #if (FRAMEWORK_TESTS) TODO
     SET(CMAKE_SKIP_BUILD_RPATH  FALSE) #TODO needed?
     SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) #TODO needed?
-    SET(CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/framework:${PROJECT_BINARY_DIR}/utils")
+    SET(CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/framework" "${PROJECT_BINARY_DIR}/utils")
 
 	add_executable(rsa_dfi_tests
 	    ${PROJECT_SOURCE_DIR}/launcher/private/src/launcher.c


Mime
View raw message