commit: 85fb4193bc649782892ad48cf01da4fc9d3f194b Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Sat Apr 30 14:23:08 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sat Apr 30 14:23:08 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fb4193
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. eclass/ros-catkin.eclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 412ff66..30132b7 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 "${@}"