From a1a82f1c4b3b6334d92f2369083b0c0d78bfee1c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 12 Feb 2019 14:19:38 +0100
Subject: [PATCH 1/5] [CI] octomap for osx

---
 ci/install_osx.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/install_osx.sh b/ci/install_osx.sh
index f9314bef5..9f90326aa 100755
--- a/ci/install_osx.sh
+++ b/ci/install_osx.sh
@@ -6,3 +6,4 @@ brew install boost
 brew install libccd
 brew install assimp
 brew install eigen
+brew install octomap

From 401af6416ba477f8d3dc4fface56f7194f95600d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Tue, 12 Feb 2019 15:47:54 +0100
Subject: [PATCH 2/5] [CMake] fix setup_hpp_project

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52a4f8d27..4e2d1027e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,4 +170,4 @@ IF(HPP_FCL_HAVE_OCTOMAP)
     "-DHPP_FCL_HAVE_OCTOMAP -DFCL_HAVE_OCTOMAP -DOCTOMAP_MAJOR_VERSION=${OCTOMAP_MAJOR_VERSION} -DOCTOMAP_MINOR_VERSION=${OCTOMAP_MINOR_VERSION} -DOCTOMAP_PATCH_VERSION=${OCTOMAP_PATCH_VERSION}")
 ENDIF(HPP_FCL_HAVE_OCTOMAP)
 
-setup_project_finalize()
+setup_hpp_project_finalize()

From 2a0f2cd7f9a1cc8f1e2fb9c014b41c07c10cde14 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Tue, 12 Feb 2019 15:59:55 +0100
Subject: [PATCH 3/5] [CI] try to speed up travis tests

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

diff --git a/.travis.yml b/.travis.yml
index 9985a15c7..93191ee34 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,11 @@
 language: cpp
 
 env:
-  - BUILD_TYPE=Debug
-  - BUILD_TYPE=Release
+  global:
+    - CTEST_PARALLEL_LEVEL=4
+  matrix:
+    - BUILD_TYPE=Debug
+    - BUILD_TYPE=Release
 
 matrix:
   include:

From 6ee7fdf6220720ca6d80f8606f2df963eef9d84b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Tue, 12 Feb 2019 16:00:42 +0100
Subject: [PATCH 4/5] [CI] if tests are failing, get verbose output

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 93191ee34..846528f5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
   - make -j4
 
   # Run unit tests
-  - make test
+  - make test || ctest -VV
 
   # Make sure we can install and uninstall with no issues
   - sudo make -j4 install

From 189965a3c857dd593ba60ae1b76797168d17c691 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@gmail.com>
Date: Tue, 12 Feb 2019 18:25:46 +0100
Subject: [PATCH 5/5] [CI] tests might need more than 10min

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 846528f5f..eee60d261 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ script:
   - make -j4
 
   # Run unit tests
-  - make test || ctest -VV
+  - travis_wait 30 make test || travis_wait 30 ctest -VV
 
   # Make sure we can install and uninstall with no issues
   - sudo make -j4 install