Skip to content

Commit

Permalink
cmake organize code coverage handling and base
Browse files Browse the repository at this point in the history
  • Loading branch information
dagar committed Jun 2, 2017
1 parent 17c1114 commit 24b26e5
Show file tree
Hide file tree
Showing 20 changed files with 1,025 additions and 938 deletions.
13 changes: 0 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,6 @@ cscope.in.out
cscope.po.out
Firmware.sublime-workspace
user.sublime*
Images/*.bin
Images/*.px4
mavlink/include/mavlink/v0.9/
/nuttx-configs/px4io-v2/src/.depend
/nuttx-configs/px4io-v2/src/Make.dep
/nuttx-configs/px4io-v2/src/libboard.a
/nuttx-configs/px4io-v1/src/.depend
/nuttx-configs/px4io-v1/src/Make.dep
/nuttx-configs/px4io-v1/src/libboard.a
/Documentation/doxy.log
/Documentation/html/
/Documentation/doxygen*objdb*tmp
Expand Down Expand Up @@ -82,10 +73,6 @@ vectorcontrol/
.idea
cmake-build-*/

# gcov code coverage
coverage-html/
coverage.info

posix-configs/SITL/init/test/*_generated

parameters.md
Expand Down
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ matrix:
sudo: required
services:
- docker
env: BUILD_TARGET=cppcheck PX4_DOCKER_REPO=px4io/px4-dev-base:ubuntu17.04
env: BUILD_TARGET=cppcheck
- os: linux
sudo: required
services:
Expand Down Expand Up @@ -104,7 +104,11 @@ after_success:
fi
# coveralls code coverage report
- if [[ "${BUILD_TARGET}" = "tests_coverage" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
./Tools/docker_run.sh 'cpp-coveralls -l coverage.info';
./Tools/docker_run.sh 'make coveralls_upload';
fi
# codecov code coverage report
- if [[ "${BUILD_TARGET}" = "tests_coverage" && "${TRAVIS_PULL_REQUEST}" = "false" ]]; then
./Tools/docker_run.sh 'make codecov_upload';
fi

addons:
Expand Down
Loading

0 comments on commit 24b26e5

Please sign in to comment.