From b3bb96005ba242296d4c2d8458853738b4062212 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Thu, 23 Feb 2017 10:15:38 +0100 Subject: eclass/ros-catkin.eclass: Regenerate devel environment before running tests. PYTHONPATH is not set properly otherwise and we end up testing the installed version, not the version we just built. --- eclass/ros-catkin.eclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'eclass/ros-catkin.eclass') diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass index 93086aa123a7..a90a8da03a35 100644 --- a/eclass/ros-catkin.eclass +++ b/eclass/ros-catkin.eclass @@ -218,6 +218,11 @@ 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 + # Regenerate env for tests, PYTHONPATH is not set properly otherwise... + if [ -f catkin_generated/generate_cached_setup.py ] ; then + einfo "Regenerating setup_cached.sh for tests" + ${PYTHON:-python} catkin_generated/generate_cached_setup.py || die + fi # 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 -- cgit v1.2.3