You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/10/06 06:30:23 UTC

[1/2] celix git commit: CELIX-263: Fixed travis setup

Repository: celix
Updated Branches:
  refs/heads/develop bd0814598 -> 846fc6461


CELIX-263: Fixed travis setup


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

Branch: refs/heads/develop
Commit: 8c488dd4e44a469e742468dcba729ee96a724fd2
Parents: c6d2d59
Author: Bjoern Petri <bp...@apache.org>
Authored: Tue Oct 6 06:29:54 2015 +0200
Committer: Bjoern Petri <bp...@apache.org>
Committed: Tue Oct 6 06:29:54 2015 +0200

----------------------------------------------------------------------
 .travis.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/8c488dd4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index df0f48b..a8550dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: c
 
-env
-
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -y uuid-dev libjansson-dev libxml2-dev
@@ -14,12 +12,9 @@ matrix:
 before_script:  
     - mkdir build install
     - 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_UTILS_TEST=ON -DCMAKE_INSTALL_PREFIX=../install ..
+    - 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_UTILS-TESTS=ON -DCMAKE_INSTALL_PREFIX=../install ..
 
 script: 
     - make all && make deploy && make install-all
-
-after_script:
-    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils
-    - ./utils/array_list_test && ./utils/celix_threads_test && ./utils/linked_list_test && ./utils/hash_map_test 
+    - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/utils && ./utils/array_list_test && ./utils/celix_threads_test && ./utils/linked_list_test && ./utils/hash_map_test 
 


[2/2] celix git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop

Posted by bp...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/celix into develop


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

Branch: refs/heads/develop
Commit: 846fc64611c20e985e6ca8e6a3f1691cedecb657
Parents: 8c488dd bd08145
Author: Bjoern Petri <bp...@apache.org>
Authored: Tue Oct 6 06:30:08 2015 +0200
Committer: Bjoern Petri <bp...@apache.org>
Committed: Tue Oct 6 06:30:08 2015 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------