summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-10-09 13:16:38 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-10-09 13:16:52 +0200
commit5220bb29741e1685b42a6312c0b7bf2821672040 (patch)
tree077085577799a50187327fe6033f308b045cd683 /eclass/ros-catkin.eclass
parentdev-ros/test_tf2: Always enable CATKIN_ENABLE_TESTING as the package has no t... (diff)
downloadgentoo-5220bb29741e1685b42a6312c0b7bf2821672040.tar.gz
gentoo-5220bb29741e1685b42a6312c0b7bf2821672040.tar.bz2
gentoo-5220bb29741e1685b42a6312c0b7bf2821672040.zip
eclass: ros-catkin.eclass: Use cmake-utils_src_make instead of plain emake for src_test so that it works with ninja too.
Diffstat (limited to 'eclass/ros-catkin.eclass')
-rw-r--r--eclass/ros-catkin.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 41405b339cd..7ceb1b3f38b 100644
--- a/eclass/ros-catkin.eclass
+++ b/eclass/ros-catkin.eclass
@@ -201,8 +201,8 @@ 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 emake tests -n &> /dev/null ; then
- emake VERBOSE=1 tests
+ if nonfatal cmake-utils_src_make tests -n &> /dev/null ; then
+ cmake-utils_src_make tests
fi
cmake-utils_src_test "${@}"
}