From 86534fd2a162328fec7140e6ba9afc1858b77e13 Mon Sep 17 00:00:00 2001
From: Henning Kayser <henningkayser@picknik.ai>
Date: Mon, 13 Apr 2020 17:18:20 +0200
Subject: [PATCH] Allow specifying catkin make arguments for testing

---
 README.md | 1 +
 travis.sh | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0bd02136..fb06821e 100644
--- a/README.md
+++ b/README.md
@@ -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.
diff --git a/travis.sh b/travis.sh
index 8c93f979..b660bc1c 100755
--- a/travis.sh
+++ b/travis.sh
@@ -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 \
@@ -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"