Repository: celix Updated Branches: refs/heads/develop 9ddda550c -> a10eef6ae
CELIX-77: Fix in travix.yml. Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/a10eef6a Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/a10eef6a Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/a10eef6a Branch: refs/heads/develop Commit: a10eef6ae89b4b5a67da8f9906ab40fba05a6be9 Parents: 9ddda55 Author: Pepijn Noltes <[email protected]> Authored: Thu Jan 14 11:41:27 2016 +0100 Committer: Pepijn Noltes <[email protected]> Committed: Thu Jan 14 11:41:27 2016 +0100 ---------------------------------------------------------------------- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/a10eef6a/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 137f0b4..25fb546 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,8 +70,8 @@ script: # RSA_SHM is only working on linux, but both compilers (see CELIX-277) - cd build - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then export BUILD_OPTS="${BUILD_OPTS} -DENABLE_CODE_COVERAGE=ON"; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ${BUILD_OPTIONS} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_LINUX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake ${BUILD_OPTIONS} ${BUILD_OPTIONS_OSX} -DBUILD_FRAMEWORK_TESTS=ON -DBUILD_UTILS-TESTS=ON -DENABLE_TESTING=ON -DFFI_LIBRARY=/usr/local/opt/libffi/lib/libffi.dylib ${BUILD_OPTS} -DCMAKE_INSTALL_PREFIX=../install ..; fi - make all && make deploy && make install-all - export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi && make test ARGS="-V"
