Skip to content

Commit

Permalink
Remove no need grepping with the default CATKIN_TOOLS_BUILD_OPTIONS (#…
Browse files Browse the repository at this point in the history
…289)

The default option is `--summarize --no-status` so there is no
`Symlinking..` output, so we can remove this line.
  • Loading branch information
wkentaro authored and k-okada committed Aug 3, 2016
1 parent 7981444 commit 8776f2d
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,7 @@ source /opt/ros/$ROS_DISTRO/setup.bash > /tmp/$$.x 2>&1; grep export\ [^_] /tmp/
# for catkin
if [ "${TARGET_PKGS// }" == "" ]; then export TARGET_PKGS=`catkin_topological_order ${CI_SOURCE_PATH} --only-names`; fi
if [ "${TEST_PKGS// }" == "" ]; then export TEST_PKGS=$( [ "${BUILD_PKGS// }" == "" ] && echo "$TARGET_PKGS" || echo "$BUILD_PKGS"); fi
set -o pipefail # this is necessary to pipe fail status on grepping
catkin build $CATKIN_TOOLS_BUILD_OPTIONS $BUILD_PKGS $CATKIN_PARALLEL_JOBS --make-args $ROS_PARALLEL_JOBS | grep -v -e Symlinking -e Linked
set +o pipefail
catkin build $CATKIN_TOOLS_BUILD_OPTIONS $BUILD_PKGS $CATKIN_PARALLEL_JOBS --make-args $ROS_PARALLEL_JOBS --

travis_time_end
travis_time_start catkin_run_tests
Expand All @@ -205,9 +203,7 @@ if [ "$ROS_DISTRO" == "hydro" ]; then
fi

source devel/setup.bash > /tmp/$$.x 2>&1; grep export\ [^_] /tmp/$$.x ; rospack profile # force to update ROS_PACKAGE_PATH for rostest
set -o pipefail # this is necessary to pipe fail status on grepping
catkin run_tests -i --no-deps --no-status $TEST_PKGS $CATKIN_PARALLEL_TEST_JOBS --make-args $ROS_PARALLEL_TEST_JOBS -- | grep -v -e Symlinking -e Linked -e :[^\s]*install[^\s]*\]
set +o pipefail
catkin run_tests -i --no-deps --no-status $TEST_PKGS $CATKIN_PARALLEL_TEST_JOBS --make-args $ROS_PARALLEL_TEST_JOBS --
catkin_test_results --verbose --all build || error

travis_time_end
Expand All @@ -218,9 +214,7 @@ if [ "$NOT_TEST_INSTALL" != "true" ]; then

catkin clean --yes || catkin clean -a # 0.3.1 uses -a, 0.4.0 uses --yes
catkin config --install $CATKIN_TOOLS_CONFIG_OPTIONS
set -o pipefail # this is necessary to pipe fail status on grepping
catkin build $CATKIN_TOOLS_BUILD_OPTIONS $BUILD_PKGS $CATKIN_PARALLEL_JOBS --make-args $ROS_PARALLEL_JOBS | grep -v -e Symlinking -e Linked -e :[^\s]*install[^\s]*\]
set +o pipefail
catkin build $CATKIN_TOOLS_BUILD_OPTIONS $BUILD_PKGS $CATKIN_PARALLEL_JOBS --make-args $ROS_PARALLEL_JOBS --
source install/setup.bash > /tmp/$$.x 2>&1; grep export\ [^_] /tmp/$$.x
rospack profile
rospack plugins --attrib=plugin nodelet || echo "ok"
Expand Down

0 comments on commit 8776f2d

Please sign in to comment.