[gentoo-commits] repo/gentoo:master commit in: dev-ros/xacro/, dev-ros/xacro/files/

[Alexis Ballier]

commit:     6eb03dd80d6c042a6397f10c1631420f4e25b602
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 16:14:04 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 17:55:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eb03dd8

dev-ros/xacro: fix tests

Closes: https://bugs.gentoo.org/734694
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/xacro/files/tests.patch   | 21 +++++++++++++++++++++
 dev-ros/xacro/xacro-1.14.1.ebuild |  6 ++++++
 dev-ros/xacro/xacro-9999.ebuild   |  6 ++++++
 3 files changed, 33 insertions(+)

diff --git a/dev-ros/xacro/files/tests.patch b/dev-ros/xacro/files/tests.patch
new file mode 100644
index 00000000000..28d4b5768c3
--- /dev/null
+++ b/dev-ros/xacro/files/tests.patch
@@ -0,0 +1,21 @@
+Index: xacro-1.14.1/test/test-cmake.sh
+===================================================================
+--- xacro-1.14.1.orig/test/test-cmake.sh
++++ xacro-1.14.1/test/test-cmake.sh
+@@ -15,6 +15,7 @@
+ test -d $1 || exit 2
+ test -r $1/CMakeLists.txt || exit 2
+ 
++basedir=`pwd`/../
+ dir=`basename $1`
+ 
+ # redirect stdout and stderr to $dir.log
+@@ -26,7 +27,7 @@ mkdir $dir
+ cd $dir
+ 
+ echo "*** running cmake ***"
+-cmake -DCATKIN_DEVEL_PREFIX=devel -DCMAKE_INSTALL_PREFIX=install $1 || exit $?
++cmake -DCATKIN_DEVEL_PREFIX="${basedir}/devel" -DCMAKE_INSTALL_PREFIX=install $1 || exit $?
+ 
+ echo
+ echo "*** running make ***"

diff --git a/dev-ros/xacro/xacro-1.14.1.ebuild b/dev-ros/xacro/xacro-1.14.1.ebuild
index 70c940ca810..775778479d6 100644
--- a/dev-ros/xacro/xacro-1.14.1.ebuild
+++ b/dev-ros/xacro/xacro-1.14.1.ebuild
@@ -22,3 +22,9 @@ DEPEND="${RDEPEND}
 "
 RDEPEND="${RDEPEND}
 	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}

diff --git a/dev-ros/xacro/xacro-9999.ebuild b/dev-ros/xacro/xacro-9999.ebuild
index 70c940ca810..775778479d6 100644
--- a/dev-ros/xacro/xacro-9999.ebuild
+++ b/dev-ros/xacro/xacro-9999.ebuild
@@ -22,3 +22,9 @@ DEPEND="${RDEPEND}
 "
 RDEPEND="${RDEPEND}
 	dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]"
+PATCHES=( "${FILESDIR}/tests.patch" )
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}