cmake organize code coverage handling and base

This commit is contained in:
Daniel Agar
2017-06-02 19:35:18 -04:00
parent 17c1114b3e
commit 24b26e53b9
20 changed files with 1027 additions and 940 deletions
+8 -3
View File
@@ -2,7 +2,7 @@
if [[ $@ =~ .*px4fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-04-22"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-06-01"
elif [[ $@ =~ .*rpi.* ]] || [[ $@ =~ .*bebop.* ]]; then
# posix_rpi_cross, posix_bebop_default
PX4_DOCKER_REPO="px4io/px4-dev-raspi:2017-04-22"
@@ -12,14 +12,18 @@ elif [[ $@ =~ .*eagle.* ]] || [[ $@ =~ .*excelsior.* ]]; then
elif [[ $@ =~ .*clang.* ]] || [[ $@ =~ .*scan-build.* ]]; then
# clang tools
PX4_DOCKER_REPO="px4io/px4-dev-clang:2017-04-22"
elif [[ $@ =~ .*cppcheck.* ]]; then
# need Ubuntu 17.04 for cppcheck cmake support
# TODO: remove this once px4io/px4-dev-base updates
PX4_DOCKER_REPO=px4io/px4-dev-base:ubuntu17.04
elif [[ $@ =~ .*tests* ]]; then
# run all tests with simulation
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2017-04-22"
PX4_DOCKER_REPO="px4io/px4-dev-simulation:2017-06-01"
fi
# otherwise default to nuttx
if [ -z "$PX4_DOCKER_REPO" ]; then
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-04-22"
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2017-06-01"
fi
# docker hygiene
@@ -46,6 +50,7 @@ docker run -it --rm -w "${SRC_DIR}" \
-e BRANCH_NAME="${BRANCH_NAME}" \
-e CCACHE_DIR="${CCACHE_DIR}" \
-e CI="${CI}" \
-e CODECOV_TOKEN="${CODECOV_TOKEN}" \
-e COVERALLS_REPO_TOKEN="${COVERALLS_REPO_TOKEN}" \
-e DISPLAY="${DISPLAY}" \
-e LOCAL_USER_ID="$(id -u)" \