From a260e1e798dc6143ba2ded0f47a34a63e171d6da Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 6 Aug 2020 18:02:24 +0200
Subject: dev-ros/test_roslaunch: fix tests

Closes: https://bugs.gentoo.org/625134
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---
 dev-ros/test_roslaunch/Manifest                    |  1 -
 .../test_roslaunch/test_roslaunch-1.15.7.ebuild    | 24 ----------------------
 .../test_roslaunch/test_roslaunch-1.15.8.ebuild    |  5 +++++
 dev-ros/test_roslaunch/test_roslaunch-9999.ebuild  |  5 +++++
 4 files changed, 10 insertions(+), 25 deletions(-)
 delete mode 100644 dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild

(limited to 'dev-ros/test_roslaunch')

diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index adf4f2af1194..00d95d9416dc 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -1,2 +1 @@
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
 DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild
deleted file mode 100644
index 4ecde6adfcdb..000000000000
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ROS_REPO_URI="https://github.com/ros/ros_comm"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=test/${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Unit tests for roslaunch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
-	test? (
-		dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}]
-		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
-	)
-"
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
index 4ecde6adfcdb..3ebd0d435c48 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild
@@ -22,3 +22,8 @@ DEPEND="${RDEPEND}
 		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	)
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
index 4ecde6adfcdb..3ebd0d435c48 100644
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
+++ b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild
@@ -22,3 +22,8 @@ DEPEND="${RDEPEND}
 		$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
 	)
 "
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
-- 
cgit v1.2.3-65-gdbad