updated testing

test/all_tests.sh

@@ -5,6 +5,28 @@ set -e
 trap 'last_command=$current_command; current_command=$BASH_COMMAND' DEBUG
 trap 'echo "$0: \"${last_command}\" command failed with exit code $?"' ERR
 
+ORIGINAL_PATH=`pwd`
+
+while [ ! -e ".catkin_tools" ]; do
+  cd ..
+  if [[ `pwd` == "/" ]]; then
+    # we reached the root and didn't find the build/COLCON_IGNORE file - that's a fail!
+    echo "$0: could not find the root of the current workspace".
+    return 1
+  fi
+done
+
+cd build
+
+OLD_FILES=$(find . -name "*.gcda")
+
+for FILE in $OLD_FILES; do
+  echo "$0: removing old coverage file '$FILE'"
+  rm $FILE
+done
+
+cd $ORIGINAL_PATH
+
 # build the package
 catkin build --this # it has to be fully built normally before building with --catkin-make-args tests
 catkin build --this --no-deps --catkin-make-args tests

test/coverage.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-PACKAGE_NAME=mrs_uav_controllers
-
 while [ ! -e ".catkin_tools" ]; do
   cd ..
   if [[ `pwd` == "/" ]]; then
@@ -11,11 +9,13 @@ while [ ! -e ".catkin_tools" ]; do
   fi
 done
 
+WORKSPACE_NAME=${PWD##*/}
+
 cd build
 
 lcov --capture --directory . --output-file coverage.info
 lcov --remove coverage.info "*/test/*" --output-file coverage.info.removed
-lcov --extract coverage.info.removed "*/mrs_uav_autostart/*" --output-file coverage.info.cleaned
+lcov --extract coverage.info.removed "*/${WORKSPACE_NAME}/src/*" --output-file coverage.info.cleaned
 genhtml -o coverage_html coverage.info.cleaned | tee /tmp/genhtml.log
 
 COVERAGE_PCT=`cat /tmp/genhtml.log | tail -n 1 | awk '{print $2}'`