Skip to content

Commit

Permalink
Allow specifying catkin make arguments for testing
Browse files Browse the repository at this point in the history
  • Loading branch information
henningkayser committed Apr 13, 2020
1 parent f243457 commit 866c154
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ script:
Setting this variable to a `http://` url, or a local file in your repository, will merge the corresponding `.rosinstall` file with [`wstool`](http://wiki.ros.org/wstool) into your workspace.
Multiple sources can be given as a comma-, or semicolon-separated lists. Note: their order matters -- if the same resource is defined twice, only the first one is considered.
- `TEST_BLACKLIST`: Allow certain tests to be skipped if necessary (not recommended).
- ´CATKIN_TEST_ARGS´: Allows to specify further Make arguments for test runs. This can be useful to enforce sequential ROS-tests (by [limiting the number of build jobs](https://catkin-tools.readthedocs.io/en/latest/verbs/catkin_build.html#controlling-the-number-of-build-jobs) using `-j1`) or other custom build options.
- `TEST`: list of additional tests to perform: clang-format, clang-tidy-check, clang-tidy-fix, catkin\_lint

More configurations as seen in [industrial_ci](https://github.com/ros-industrial/industrial_ci) can be added in the future.
Expand Down
3 changes: 2 additions & 1 deletion travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ function run_docker() {
-e TRAVIS_OS_NAME \
-e TEST_PKG \
-e TEST \
-e CATKIN_TEST_ARGS \
-e PKG_WHITELIST \
-e TEST_BLACKLIST \
-e WARNINGS_OK \
Expand Down Expand Up @@ -320,7 +321,7 @@ function test_workspace() {
# Build tests
travis_run_wait --title "catkin build tests" catkin build --no-status --summarize --make-args tests -- ${PKG_WHITELIST:-}
# Run tests
travis_run_wait --title "catkin run_tests" "catkin build --catkin-make-args run_tests -- --no-status --summarize ${PKG_WHITELIST:-}"
travis_run_wait --title "catkin run_tests" catkin build --catkin-make-args run_tests -- --no-status --summarize ${CATKIN_TEST_ARGS:-} ${PKG_WHITELIST:-}

# Show failed tests
travis_fold start test.results "catkin_test_results"
Expand Down

0 comments on commit 866c154

Please sign in to comment.