You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by pn...@apache.org on 2015/10/29 16:28:54 UTC
[03/50] celix git commit: CELIX-237: Updated travis config. Changed
LD_LIBRARY_PATH to include /usr/local/lib
CELIX-237: Updated travis config. Changed LD_LIBRARY_PATH to include /usr/local/lib
Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/9562f3d2
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/9562f3d2
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/9562f3d2
Branch: refs/heads/feature/CELIX-269_depman
Commit: 9562f3d26fe5dbb8a080a2bbffadfb26c5dd725f
Parents: 15fc3ab
Author: Pepijn Noltes <pe...@gmail.com>
Authored: Wed Oct 14 10:59:02 2015 +0200
Committer: Pepijn Noltes <pe...@gmail.com>
Committed: Wed Oct 14 10:59:02 2015 +0200
----------------------------------------------------------------------
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/celix/blob/9562f3d2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 574540d..f875ced 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ before_script:
- tar xzf /tmp/libffi.tar.gz
- cd libffi*
- ./configure --prefix=/usr/local && make && sudo make install
- - ls /usr/local
- cd -
- mkdir build install
@@ -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=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && make test ARGS="-V" && make coverage
+ - 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