celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [30/51] celix git commit: CELIX-77: Fix in travis.yml. Seperated some options for osx & linux
Date Mon, 25 Jan 2016 18:01:46 GMT
CELIX-77: Fix in travis.yml. Seperated some options for osx & linux


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

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: 9c7973f06dac5d03abfa109c2c26325b5e0b762f
Parents: df91e19
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Thu Jan 14 11:31:57 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Thu Jan 14 11:31:57 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/9c7973f0/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index fca6b4e..cb3745f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,14 +50,18 @@ before_script:
         -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_REMOTE_SHELL=ON \
+        -DBUILD_SHELL=ON \
         -DBUILD_SHELL_TUI=ON -DBUILD_DEVICE_ACCESS=ON \
         -DBUILD_DEVICE_ACCESS_EXAMPLE=ON "
-
+    - export BUILD_OPTIONS_LINUX=" \
+        -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=ON \
+        -DBUILD_RSA_DISCOVERY_SHM=ON "
+    - export BUILD_OPTIONS_OSX=" \
+        -DBUILD_RSA_REMOTE_SERVICE_ADMIN_SHM=OFF \
+        -DBUILD_RSA_DISCOVERY_SHM=OFF "
 
 script:
     - if [ "$SANITIZE" == 1 ]; then export CC=/usr/bin/gcc-4.8 CXX=/usr/bin/g++-4.8 CFLAGS="-lasan
-fsanitize=address"  CXXFLAGS="-lasan -fsanitize=address" ASAN_OPTIONS="symbolize=1" ASAN_SYMBOLIZER_PATH="/usr/local/clang-3.4/bin/llvm-symbolizer";
fi


Mime
View raw message