From 85fb4193bc649782892ad48cf01da4fc9d3f194b Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 30 Apr 2016 16:23:08 +0200 Subject: 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(-) (limited to 'eclass/ros-catkin.eclass') diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 412ff66e01c9..30132b70c4b9 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 "${@}" -- cgit v1.2.3-65-gdbad