[gentoo-commits] repo/gentoo:master commit in: dev-ros/rosmsg/

[Alexis Ballier]

commit:     af00dfbe50647735ab17d743200213da486c7560
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  2 13:55:53 2021 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Apr  5 09:52:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af00dfbe

dev-ros/rosmsg: fix src_test

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>

 dev-ros/rosmsg/rosmsg-1.15.10.ebuild | 12 +++++++++++-
 dev-ros/rosmsg/rosmsg-1.15.9.ebuild  | 10 ++++++----
 dev-ros/rosmsg/rosmsg-9999.ebuild    | 14 ++++++++++++--
 3 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/dev-ros/rosmsg/rosmsg-1.15.10.ebuild 
b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
index 34327c1b7d4..d4be4db4044 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.10.ebuild
@@ -21,5 +21,15 @@ RDEPEND="
        dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-       test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+       test? (
+               dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+               dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+               dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+               dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       )
 "
+
+src_test() {
+       export 
ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+       ros-catkin_src_test
+}

diff --git a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild 
b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
index c750959458b..a1986af34a3 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,11 +21,13 @@ RDEPEND="
        dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-       test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+       test? (
+               dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+               dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       )
 "
-PATCHES=( "${FILESDIR}/duplicates.patch" )
 
 src_test() {
-       export ROS_PACKAGE_PATH="${S}/../../:${ROS_PACKAGE_PATH}"
+       export 
ROS_PACKAGE_PATH="${S}:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs"
        ros-catkin_src_test
 }

diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild 
b/dev-ros/rosmsg/rosmsg-9999.ebuild
index ba0d62bb080..d4be4db4044 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,5 +21,15 @@ RDEPEND="
        dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-       test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
+       test? (
+               dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}]
+               dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+               dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+               dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+       )
 "
+
+src_test() {
+       export 
ROS_PACKAGE_PATH="${S}/../..:${EPREFIX}/usr/share/ros_packages/diagnostic_msgs:${EPREFIX}/usr/share/ros_packages/std_msgs:${EPREFIX}/usr/share/ros_packages/std_srvs"
+       ros-catkin_src_test
+}