summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2016-04-30 16:23:08 +0200
committerAlexis Ballier <aballier@gentoo.org>2016-04-30 16:23:08 +0200
commit85fb4193bc649782892ad48cf01da4fc9d3f194b (patch)
treed016be08d45ae4b90bbbb34cd213c2facc559603 /eclass/ros-catkin.eclass
parentdev-ros/rviz: bump to 1.12.1 (diff)
downloadgentoo-85fb4193bc649782892ad48cf01da4fc9d3f194b.tar.gz
gentoo-85fb4193bc649782892ad48cf01da4fc9d3f194b.tar.bz2
gentoo-85fb4193bc649782892ad48cf01da4fc9d3f194b.zip
eclass/ros-catkin.eclass: use emake tests with nonfatal as nonfatal is still fatal with cmake-utils_src_make and breaks e.g. dev-ros/rviz.
Diffstat (limited to 'eclass/ros-catkin.eclass')
-rw-r--r--eclass/ros-catkin.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 412ff66e01c..30132b70c4b 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -202,7 +202,9 @@ ros-catkin_src_compile() {
# Decorator around cmake-utils_src_test to ensure tests are built before running them.
ros-catkin_src_test_internal() {
cd "${BUILD_DIR}" || die
- if nonfatal cmake-utils_src_make tests -n &> /dev/null ; then
+ # Using cmake-utils_src_make with nonfatal does not work and breaks e.g.
+ # dev-ros/rviz.
+ if nonfatal emake tests -n &> /dev/null ; then
cmake-utils_src_make tests
fi
cmake-utils_src_test "${@}"