| 1 |
commit: 85fb4193bc649782892ad48cf01da4fc9d3f194b |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 14:23:08 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 14:23:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fb4193 |
| 7 |
|
| 8 |
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. |
| 9 |
|
| 10 |
eclass/ros-catkin.eclass | 4 +++- |
| 11 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass |
| 14 |
index 412ff66..30132b7 100644 |
| 15 |
--- a/eclass/ros-catkin.eclass |
| 16 |
+++ b/eclass/ros-catkin.eclass |
| 17 |
@@ -202,7 +202,9 @@ ros-catkin_src_compile() { |
| 18 |
# Decorator around cmake-utils_src_test to ensure tests are built before running them. |
| 19 |
ros-catkin_src_test_internal() { |
| 20 |
cd "${BUILD_DIR}" || die |
| 21 |
- if nonfatal cmake-utils_src_make tests -n &> /dev/null ; then |
| 22 |
+ # Using cmake-utils_src_make with nonfatal does not work and breaks e.g. |
| 23 |
+ # dev-ros/rviz. |
| 24 |
+ if nonfatal emake tests -n &> /dev/null ; then |
| 25 |
cmake-utils_src_make tests |
| 26 |
fi |
| 27 |
cmake-utils_src_test "${@}" |
Archives