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-237: Added LD_PRELOAD for libffi
Date Wed, 14 Oct 2015 09:34:47 GMT
Repository: celix
Updated Branches:
  refs/heads/develop a5d95e94e -> 05ece9442


CELIX-237: Added LD_PRELOAD for libffi


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

Branch: refs/heads/develop
Commit: 05ece94420b0532d808ebf01db527d1bfbcef025
Parents: a5d95e9
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Oct 14 11:34:25 2015 +0200
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Oct 14 11:34:25 2015 +0200

----------------------------------------------------------------------
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/05ece944/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 66f4c2e..55d4008 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,6 @@ language: c
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev lcov pkg-config
-  - sudo apt-get remove -y libffi
 
 matrix:
   include:
@@ -30,7 +29,7 @@ script:
     - cd build
     - cmake -DFFI_LIBRARY=/usr/local/lib/libffi.so -DFFI_INCLUDE_DIR=/usr/local/include -DBUILD_DEPLOYMENT_ADMIN=ON
-DBUILD_EXAMPLES=ON -DBUILD_LOG_SERVICE=ON -DBUILD_LOG_WRITER=ON -DBUILD_REMOTE_SERVICE_ADMIN=ON
-DBUILD_RSA_DISCOVERY_CONFIGURED=ON -DBUILD_RSA_DISCOVERY_ETCD=ON -DBUILD_RSA_DISCOVERY_SHM=ON
-DBUILD_RSA_EXAMPLES=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_HTTP=ON
-DBUILD_REMOTE_SHELL=ON -DBUILD_SHELL=ON -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON -DBUILD_DEVICE_ACCESS_EXAMPLE=ON
-DBUILD_FRAMEWORK_TESTS=OFF -DENABLE_CODE_COVERAGE=ON -DENABLE_TESTING=ON -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON
-DCMAKE_INSTALL_PREFIX=../install ..
     - make all && make deploy && make install-all
-    - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework
&& make test ARGS="-V" && make coverage
+    - export LD_PRELOAD=/usr/local/lib/libffi.so && export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework
&& make test ARGS="-V" && make coverage
 
 after_success:
     - cd ${TRAVIS_BUILD_DIR}/build


Mime
View raw message