Skip to content

Commit

Permalink
Set default --no-status to CATKIN_TOOLS_BUILD_OPTIONS
Browse files Browse the repository at this point in the history
This commit fixes belows:

- Typo "ROS_DISTRO" should be "$ROS_DISTRO", but checking catkin-tools
  version is better.
- Replace `--limit-status 0.002` with `--no-status` the status limit
  should be specified in .travis.yml like
  `export CATKIN_TOOLS_BUILD_OPTIONS="-iv --summarize --limit-status 0.001"`.
  • Loading branch information
wkentaro committed Aug 10, 2016
1 parent 27176cd commit 6f5d717
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ if [ ! "$CATKIN_PARALLEL_TEST_JOBS" ]; then export CATKIN_PARALLEL_TEST_JOBS="$C
if [ ! "$ROS_REPOSITORY_PATH" ]; then export ROS_REPOSITORY_PATH="http://packages.ros.org/ros-shadow-fixed/ubuntu"; fi
if [ ! "$ROSDEP_ADDITIONAL_OPTIONS" ]; then export ROSDEP_ADDITIONAL_OPTIONS="-n -q -r --ignore-src"; fi
if [ ! "$CATKIN_TOOLS_BUILD_OPTIONS" ]; then
if [ "ROS_DISTRO" = "hydro" ]; then
export CATKIN_TOOLS_BUILD_OPTIONS="-iv --summarize --limit-status-rate 0.002"
if [[ "$(pip show catkin-tools | grep '^Version:' | awk '{print $2}')" ~= 0.3.[0-9]+ ]]; then
# For catkin-tools==0.3.X, '-iv' option is required to get the stderr output.
export CATKIN_TOOLS_BUILD_OPTIONS="-iv --summarize --no-status"
else
export CATKIN_TOOLS_BUILD_OPTIONS="--summarize --limit-status-rate 0.002"
export CATKIN_TOOLS_BUILD_OPTIONS="--summarize --no-status"
fi
fi
echo "Testing branch $TRAVIS_BRANCH of $REPOSITORY_NAME"
Expand Down

0 comments on commit 6f5d717

Please sign in to comment.