public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/costmap_2d/
Date: Fri,  7 Aug 2020 13:16:35 +0000 (UTC)	[thread overview]
Message-ID: <1596806177.72fbda4fafc96f5a480a7dfcb98409c12e0adcc2.aballier@gentoo> (raw)

commit:     72fbda4fafc96f5a480a7dfcb98409c12e0adcc2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 12:54:13 2020 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 13:16:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72fbda4f

dev-ros/costmap_2d: fix tests

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

 dev-ros/costmap_2d/Manifest                    |  4 ++++
 dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild | 21 ++++++++++++++++++++-
 dev-ros/costmap_2d/costmap_2d-9999.ebuild      | 21 ++++++++++++++++++++-
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/dev-ros/costmap_2d/Manifest b/dev-ros/costmap_2d/Manifest
index a4fee98c8c5..ea5b51a1bae 100644
--- a/dev-ros/costmap_2d/Manifest
+++ b/dev-ros/costmap_2d/Manifest
@@ -1 +1,5 @@
+DIST costmap_2d-1.17.0-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
+DIST costmap_2d-1.17.0-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
+DIST costmap_2d-9999-simple_driving_test_indexed.bag 945511 BLAKE2B 49cef9884a1a174548239576d720c4e49797098aed9406bbbc954abfaf28844ed432092f79d346ebe471b26f48b612d3265a2d7e2303c2f129a5109b241f6fa4 SHA512 101beca7279c1ac6eecb5af243b6ec73c280958107004d84c438a8d79ff45b1bfadeb9b1956939b339c2ed32ed3d0e9e88af11340410b34ff73943dbe5fac463
+DIST costmap_2d-9999-willow-full-0.025.pgm 4255956 BLAKE2B 884ee8d9cc6d346b86d0b15ee4d0184598502094bda23e2ee3df21138ab3c8dd1fe1156dc869f452d4db1262b102653764a1a005af7fd61a142efad4adb82d90 SHA512 539fffebad08e0580e42369d98a1375cde5df7c7479e4d58cae00266cbefebb2e221f5e6b936b413498860b871221df6d5bec20b93cf7e2b8121b062138303ee
 DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26

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
index abc47144df8..f07bee5f0d3 100644
--- a/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-1.17.0-r1.ebuild
@@ -15,12 +15,17 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 REQUIRED_USE="ros_messages_cxx"
+DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
+for i in ${DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
+done
 
 RDEPEND="
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/laser_geometry
 	dev-ros/message_filters
-	dev-ros/pluginlib
+	>=dev-ros/pluginlib-1.13.0-r1
 	dev-ros/roscpp
 	dev-ros/tf2
 	dev-ros/tf2_ros
@@ -47,3 +52,17 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	dev-ros/cmake_modules
 "
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}

diff --git a/dev-ros/costmap_2d/costmap_2d-9999.ebuild b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
index abc47144df8..f07bee5f0d3 100644
--- a/dev-ros/costmap_2d/costmap_2d-9999.ebuild
+++ b/dev-ros/costmap_2d/costmap_2d-9999.ebuild
@@ -15,12 +15,17 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 REQUIRED_USE="ros_messages_cxx"
+DATA="simple_driving_test_indexed.bag willow-full-0.025.pgm"
+for i in ${DATA}; do
+	SRC_URI="${SRC_URI}
+		http://download.ros.org/data/costmap_2d/${i} -> ${P}-${i}"
+done
 
 RDEPEND="
 	dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/laser_geometry
 	dev-ros/message_filters
-	dev-ros/pluginlib
+	>=dev-ros/pluginlib-1.13.0-r1
 	dev-ros/roscpp
 	dev-ros/tf2
 	dev-ros/tf2_ros
@@ -47,3 +52,17 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	dev-ros/cmake_modules
 "
+
+src_prepare() {
+	ros-catkin_src_prepare
+	for i in ${DATA}; do
+		cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die
+	done
+	sed -e "s#http://download.ros.org/data/costmap_2d/#file://${S}/#" -i CMakeLists.txt || die
+}
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	export CATKIN_PREFIX_PATH="${BUILD_DIR}/devel/:${CATKIN_PREFIX_PATH}"
+	ros-catkin_src_test
+}


             reply	other threads:[~2020-08-07 13:16 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-07 13:16 Alexis Ballier [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-08-06 12:29 [gentoo-commits] repo/gentoo:master commit in: dev-ros/costmap_2d/ Alexis Ballier
2020-07-10 16:02 Alexis Ballier
2020-07-10 16:02 Alexis Ballier
2019-12-11 16:12 Alexis Ballier
2018-08-04 18:46 Alexis Ballier
2018-07-31 13:09 Alexis Ballier
2018-07-30 12:25 Alexis Ballier
2018-07-27 10:56 Alexis Ballier
2018-03-25 13:48 Alexis Ballier
2017-08-23  7:30 Alexis Ballier
2017-08-15  6:25 Alexis Ballier
2016-06-28 10:57 Alexis Ballier
2016-06-28 10:57 Alexis Ballier
2016-05-23  9:01 Alexis Ballier
2015-11-01 10:07 Alexis Ballier
2015-10-09  9:01 Alexis Ballier
2015-09-30 12:04 Alexis Ballier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1596806177.72fbda4fafc96f5a480a7dfcb98409c12e0adcc2.aballier@gentoo \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox