| 1 |
commit: 72fbda4fafc96f5a480a7dfcb98409c12e0adcc2 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 7 12:54:13 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 7 13:16:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72fbda4f |
| 7 |
|
| 8 |
dev-ros/costmap_2d: fix tests |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/736216 |
| 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/costmap_2d/Manifest | 4 ++++ |
| 15 |
dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild | 21 ++++++++++++++++++++- |
| 16 |
dev-ros/costmap_2d/costmap_2d-9999.ebuild | 21 ++++++++++++++++++++- |
| 17 |
3 files changed, 44 insertions(+), 2 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest |
| 20 |
index a4fee98c8c5..ea5b51a1bae 100644 |
| 21 |
--- a/dev-ros/costmap_2d/Manifest |
| 22 |
+++ b/dev-ros/costmap_2d/Manifest |
| 23 |
@@ -1 +1,5 @@ |
| 24 |
+DIST costmap_2d-1.17.0-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463 |
| 25 |
+DIST costmap_2d-1.17.0-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee |
| 26 |
+DIST costmap_2d-9999-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463 |
| 27 |
+DIST costmap_2d-9999-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee |
| 28 |
DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26 |
| 29 |
|
| 30 |
diff --git a/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild b/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild |
| 31 |
index abc47144df8..f07bee5f0d3 100644 |
| 32 |
--- a/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild |
| 33 |
+++ b/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild |
| 34 |
@@ -15,12 +15,17 @@ LICENSE="BSD" |
| 35 |
SLOT="0" |
| 36 |
IUSE="" |
| 37 |
REQUIRED_USE="ros_messages_cxx" |
| 38 |
+DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm" |
| 39 |
+for i in ${DATA}; do |
| 40 |
+ SRC_URI="${SRC_URI} |
| 41 |
+ http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}" |
| 42 |
+done |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] |
| 46 |
dev-ros/laser_geometry |
| 47 |
dev-ros/message_filters |
| 48 |
- dev-ros/pluginlib |
| 49 |
+ >=dev-ros/pluginlib-1.13.0-r1 |
| 50 |
dev-ros/roscpp |
| 51 |
dev-ros/tf2 |
| 52 |
dev-ros/tf2_ros |
| 53 |
@@ -47,3 +52,17 @@ DEPEND="${RDEPEND} |
| 54 |
BDEPEND=" |
| 55 |
dev-ros/cmake_modules |
| 56 |
" |
| 57 |
+ |
| 58 |
+src_prepare() { |
| 59 |
+ ros-catkin_src_prepare |
| 60 |
+ for i in ${DATA}; do |
| 61 |
+ cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die |
| 62 |
+ done |
| 63 |
+ sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die |
| 64 |
+} |
| 65 |
+ |
| 66 |
+src_test() { |
| 67 |
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 68 |
+ export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}" |
| 69 |
+ ros-catkin_src_test |
| 70 |
+} |
| 71 |
|
| 72 |
diff --git a/dev-ros/costmap_2d/costmap_2d-9999.ebuild b/dev-ros/costmap_2d/costmap_2d-9999.ebuild |
| 73 |
index abc47144df8..f07bee5f0d3 100644 |
| 74 |
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild |
| 75 |
+++ b/dev-ros/costmap_2d/costmap_2d-9999.ebuild |
| 76 |
@@ -15,12 +15,17 @@ LICENSE="BSD" |
| 77 |
SLOT="0" |
| 78 |
IUSE="" |
| 79 |
REQUIRED_USE="ros_messages_cxx" |
| 80 |
+DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm" |
| 81 |
+for i in ${DATA}; do |
| 82 |
+ SRC_URI="${SRC_URI} |
| 83 |
+ http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}" |
| 84 |
+done |
| 85 |
|
| 86 |
RDEPEND=" |
| 87 |
dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] |
| 88 |
dev-ros/laser_geometry |
| 89 |
dev-ros/message_filters |
| 90 |
- dev-ros/pluginlib |
| 91 |
+ >=dev-ros/pluginlib-1.13.0-r1 |
| 92 |
dev-ros/roscpp |
| 93 |
dev-ros/tf2 |
| 94 |
dev-ros/tf2_ros |
| 95 |
@@ -47,3 +52,17 @@ DEPEND="${RDEPEND} |
| 96 |
BDEPEND=" |
| 97 |
dev-ros/cmake_modules |
| 98 |
" |
| 99 |
+ |
| 100 |
+src_prepare() { |
| 101 |
+ ros-catkin_src_prepare |
| 102 |
+ for i in ${DATA}; do |
| 103 |
+ cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die |
| 104 |
+ done |
| 105 |
+ sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die |
| 106 |
+} |
| 107 |
+ |
| 108 |
+src_test() { |
| 109 |
+ export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" |
| 110 |
+ export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}" |
| 111 |
+ ros-catkin_src_test |
| 112 |
+} |
Archives