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/27 16:21:07 UTC

[02/50] celix git commit: CELIX-237: fixed travis cfg

CELIX-237: fixed travis cfg


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

Branch: refs/heads/feature/CELIX-230_Refactoring_of_the_shell_command_service
Commit: db28655510ffc423f4d752b9bfb6e0a6109e3748
Parents: 38931fd
Author: Bjoern Petri <bp...@apache.org>
Authored: Tue Oct 13 18:40:32 2015 +0200
Committer: Bjoern Petri <bp...@apache.org>
Committed: Tue Oct 13 18:40:32 2015 +0200

----------------------------------------------------------------------
 .travis.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/db286555/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index e12d4c4..32ff300 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,23 +13,19 @@ before_script:
     - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true -O /tmp/cpputest.tar.gz
     - tar -xzvf /tmp/cpputest.tar.gz -C /tmp 
     - if [ "$CC" = "clang" ]; then export CXX="clang++"; fi && cd /tmp/cpputest-3.7.1 && ./configure --prefix=/usr && make && sudo make install && cd -
-    - mkdir build install
     - git clone -b 2.7 --single-branch https://github.com/akheron/jansson.git jansson-build
     - cd jansson-build
     - cmake -DJANSSON_BUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=/usr . && make
     - sudo make install
-    - cd -
     - mkdir build install
+
+script:
     - cd build
     - cmake -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 -DBUILD_RSA_REMOTE_SERVICE_ADMIN_DFI=ON -DENABLE_TESTING=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 && make coverage
+    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils:`pwd`/framework && make test ARGS="-V" && make coverage
 
 after_success:
     - cd ${TRAVIS_BUILD_DIR}/build
     - gem install coveralls-lcov
     - lcx="lcov --output-file=coverage.info " && for i in `find . -name "*.info.cleaned"`; do lcx+=" --add-tracefile=$i"; done && $lcx && coveralls-lcov --repo-token=9dpeTAjiGoQU5hgXFe0ezk65iu40oc3WY coverage.info
-
-script: 
-    - make all 
-    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && make test ARGS="-V"