| 1 |
commit: a260e1e798dc6143ba2ded0f47a34a63e171d6da |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 6 16:02:24 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 6 16:09:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a260e1e7 |
| 7 |
|
| 8 |
dev-ros/test_roslaunch: fix tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/625134 |
| 11 |
Package-Manager: Portage-3.0.1, Repoman-2.3.23 |
| 12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ros/test_roslaunch/Manifest | 1 - |
| 15 |
.../test_roslaunch/test_roslaunch-1.15.7.ebuild | 24 ---------------------- |
| 16 |
.../test_roslaunch/test_roslaunch-1.15.8.ebuild | 5 +++++ |
| 17 |
dev-ros/test_roslaunch/test_roslaunch-9999.ebuild | 5 +++++ |
| 18 |
4 files changed, 10 insertions(+), 25 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest |
| 21 |
index adf4f2af119..00d95d9416d 100644 |
| 22 |
--- a/dev-ros/test_roslaunch/Manifest |
| 23 |
+++ b/dev-ros/test_roslaunch/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e |
| 26 |
DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9 |
| 27 |
|
| 28 |
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index 4ecde6adfcd..00000000000 |
| 31 |
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.7.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,24 +0,0 @@ |
| 34 |
-# Copyright 1999-2020 Gentoo Authors |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
- |
| 37 |
-EAPI=7 |
| 38 |
- |
| 39 |
-ROS_REPO_URI="https://github.com/ros/ros_comm" |
| 40 |
-KEYWORDS="~amd64 ~arm" |
| 41 |
-ROS_SUBDIR=test/${PN} |
| 42 |
- |
| 43 |
-inherit ros-catkin |
| 44 |
- |
| 45 |
-DESCRIPTION="Unit tests for roslaunch" |
| 46 |
-LICENSE="BSD" |
| 47 |
-SLOT="0" |
| 48 |
-IUSE="" |
| 49 |
- |
| 50 |
-RDEPEND="" |
| 51 |
-DEPEND="${RDEPEND} |
| 52 |
- dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] |
| 53 |
- test? ( |
| 54 |
- dev-ros/roslaunch[${PYTHON_SINGLE_USEDEP}] |
| 55 |
- $(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") |
| 56 |
- ) |
| 57 |
-" |
| 58 |
|
| 59 |
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild |
| 60 |
index 4ecde6adfcd..3ebd0d435c4 100644 |
| 61 |
--- a/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild |
| 62 |
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.8.ebuild |
| 63 |
@@ -22,3 +22,8 @@ DEPEND="${RDEPEND} |
| 64 |
$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") |
| 65 |
) |
| 66 |
" |
| 67 |
+ |
| 68 |
+src_test() { |
| 69 |
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 70 |
+ ros-catkin_src_test |
| 71 |
+} |
| 72 |
|
| 73 |
diff --git a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild |
| 74 |
index 4ecde6adfcd..3ebd0d435c4 100644 |
| 75 |
--- a/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild |
| 76 |
+++ b/dev-ros/test_roslaunch/test_roslaunch-9999.ebuild |
| 77 |
@@ -22,3 +22,8 @@ DEPEND="${RDEPEND} |
| 78 |
$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") |
| 79 |
) |
| 80 |
" |
| 81 |
+ |
| 82 |
+src_test() { |
| 83 |
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 84 |
+ ros-catkin_src_test |
| 85 |
+} |
Archives