Skip to content

Commit 866c154

Browse files
committed
Allow specifying catkin make arguments for testing
1 parent f243457 commit 866c154

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ script:
7777
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.
7878
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.
7979
- `TEST_BLACKLIST`: Allow certain tests to be skipped if necessary (not recommended).
80+
- ´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.
8081
- `TEST`: list of additional tests to perform: clang-format, clang-tidy-check, clang-tidy-fix, catkin\_lint
8182

8283
More configurations as seen in [industrial_ci](https://github.com/ros-industrial/industrial_ci) can be added in the future.

travis.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ function run_docker() {
8989
-e TRAVIS_OS_NAME \
9090
-e TEST_PKG \
9191
-e TEST \
92+
-e CATKIN_TEST_ARGS \
9293
-e PKG_WHITELIST \
9394
-e TEST_BLACKLIST \
9495
-e WARNINGS_OK \
@@ -320,7 +321,7 @@ function test_workspace() {
320321
# Build tests
321322
travis_run_wait --title "catkin build tests" catkin build --no-status --summarize --make-args tests -- ${PKG_WHITELIST:-}
322323
# Run tests
323-
travis_run_wait --title "catkin run_tests" "catkin build --catkin-make-args run_tests -- --no-status --summarize ${PKG_WHITELIST:-}"
324+
travis_run_wait --title "catkin run_tests" catkin build --catkin-make-args run_tests -- --no-status --summarize ${CATKIN_TEST_ARGS:-} ${PKG_WHITELIST:-}
324325

325326
# Show failed tests
326327
travis_fold start test.results "catkin_test_results"

0 commit comments

Comments
 (0)