[gentoo-commits] repo/gentoo:master commit in: eclass/

[Alexis Ballier]

commit:     b3bb96005ba242296d4c2d8458853738b4062212
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 09:15:38 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 09:15:55 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3bb9600

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(+)

diff --git a/eclass/ros-catkin.eclass b/eclass/ros-catkin.eclass
index 93086aa123..a90a8da03a 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