From da29beda47b08e25da640178cbc38caf12edcdcf Mon Sep 17 00:00:00 2001 From: Oleg Kalachev Date: Tue, 2 Jul 2019 02:54:20 +0300 Subject: [PATCH] builder: run tests after GeographicLib datasets is installed --- builder/image-ros.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builder/image-ros.sh b/builder/image-ros.sh index 3daf205c..9f1913c5 100755 --- a/builder/image-ros.sh +++ b/builder/image-ros.sh @@ -155,8 +155,6 @@ echo_stamp "Installing CLEVER" \ && my_travis_retry pip install -r /home/pi/catkin_ws/src/clever/clever/requirements.txt \ && source /opt/ros/kinetic/setup.bash \ && catkin_make -j2 -DCMAKE_BUILD_TYPE=Release \ -&& catkin_make run_tests \ -&& catkin_test_results \ && systemctl enable roscore \ && systemctl enable clever \ && echo_stamp "All CLEVER was installed!" "SUCCESS" \ @@ -180,9 +178,12 @@ apt-get install -y --no-install-recommends \ ros-kinetic-rosshow # TODO move GeographicLib datasets to Mavros debian package -echo_stamp "Install GeographicLib datasets (needs for mavros)" \ +echo_stamp "Install GeographicLib datasets (needed for mavros)" \ && wget -qO- https://raw.githubusercontent.com/mavlink/mavros/master/mavros/scripts/install_geographiclib_datasets.sh | bash +echo_stamp "Running tests" +catkin_make run_tests && catkin_test_results + echo_stamp "Change permissions for catkin_ws" chown -Rf pi:pi /home/pi/catkin_ws