Merge pull request #43 from esteve/travis-robustness-43

Use catkin to build and run the testsuite
osrf · Feb 13, 2014 · 3ea454f · 3ea454f
2 parents dc7f626 + cf60748
commit 3ea454f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,7 +12,7 @@ install:
 script:
   - source /opt/ros/hydro/setup.bash
   - make coverage
-  - catkin_test_results /tmp/capabilities_build/test_results
+  - catkin_test_results /tmp/capabilities_build/build/test_results
 notifications:
   email: false
 after_success:

diff --git a/Makefile b/Makefile
@@ -17,10 +17,11 @@ coverage:
 	-rm ~/.ros/.coverage
 	-rm ${BUILD_DIR}/.coverage
 	-rm ./.coverage
-	cd ${BUILD_DIR} && cmake ${SRC_DIR} -DCMAKE_INSTALL_PREFIX=`pwd`/install
-	cd ${BUILD_DIR} && make
-	cd ${BUILD_DIR} && make tests
-	cd ${BUILD_DIR} && make run_tests
+	cd ${BUILD_DIR} && mkdir src
+	ln -s ${SRC_DIR} ${BUILD_DIR}/src
+	cd ${BUILD_DIR} && catkin_make
+	cd ${BUILD_DIR} && catkin_make tests
+	cd ${BUILD_DIR} && catkin_make -j1 run_tests
 	catkin_test_results ${BUILD_DIR}
 	ls ${HOME}/.ros/.coverage
 	cp ${HOME}/.ros/.coverage ./.coverage.1