celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [47/51] celix git commit: CELIX-247: enable travis for android
Date Mon, 25 Jan 2016 18:02:03 GMT
CELIX-247: enable travis for android


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

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: 8302c5f1040eff201c4365fa3fd055f7a2cd6f45
Parents: 25f6497
Author: Bjoern Petri <bpetri@apache.org>
Authored: Sun Jan 24 12:09:48 2016 +0100
Committer: Bjoern Petri <bpetri@apache.org>
Committed: Sun Jan 24 12:09:48 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8302c5f1/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c15ffd9..33c2c8e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,7 @@
 
+sudo: required
+dist: trusty
+
 language: c
 
 os:
@@ -9,6 +12,9 @@ compiler:
     - gcc
     - clang
 
+services:
+    - docker
+
 
 env:
     global:
@@ -25,9 +31,13 @@ matrix:
        - os: linux
          compiler: gcc
          env: SANITIZE=1
+       - os: linux
+         compiler: clang
+         env: ANDROID=1
+
 
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-y && sudo apt-get -qq update && sudo apt-get install -y uuid-dev libxml2-dev
lcov libffi-dev gcc-4.8 g++-4.8; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ] &&  [ -z "$ANDROID" ]; then sudo add-apt-repository
ppa:ubuntu-toolchain-r/test -y && sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev gcc-4.8 g++-4.8; fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
&& brew link --force libffi; fi
 
 before_script:
@@ -71,10 +81,10 @@ 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} ${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" = "linux" ] && [ -z "$ANDROID" ]; 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" 
+    - if [ -z "$ANDROID" ]; then make all && make deploy && make install-all;
else docker build -t celixandroid ..; fi
+    - if [ -z "$ANDROID" ]; then export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework:`pwd`/dfi
&& make test ARGS="-V"; else docker run celixandroid; fi 
 
 after_success:
     - if [ "$CC" = "gcc" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then 


Mime
View raw message