commit: 0d5e71561f2ea6c40d6cca73cbf36d341dd07087 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Wed Aug 5 17:54:25 2020 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Wed Aug 5 17:55:03 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d5e7156
dev-ros/amcl: fix tests Closes: https://bugs.gentoo.org/734668 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ros/amcl/Manifest | 18 ++++++++++++++++++ dev-ros/amcl/amcl-1.17.0.ebuild | 26 ++++++++++++++++++++++++++ dev-ros/amcl/amcl-9999.ebuild | 26 ++++++++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/dev-ros/amcl/Manifest b/dev-ros/amcl/Manifest index a4fee98c8c5..d8b5e0ccd53 100644 --- a/dev-ros/amcl/Manifest +++ b/dev-ros/amcl/Manifest @@ -1 +1,19 @@ +DIST amcl-1.17.0-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f +DIST amcl-1.17.0-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f +DIST amcl-1.17.0-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4 +DIST amcl-1.17.0-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea +DIST amcl-1.17.0-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08 +DIST amcl-1.17.0-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a +DIST amcl-1.17.0-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c +DIST amcl-1.17.0-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02 +DIST amcl-1.17.0-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d +DIST amcl-9999-basic_localization_stage_indexed.bag 1168671 BLAKE2B 487e378ca985a011aca7aec07dda82859724625ae5f5b522902db91fdc2d63e69d2a031c41287c92867acbcf58d6c0016fd78397c4c78a974d0d86bc5729deef SHA512 2352cbe391a3fd36f325e3a0dc3b343dda8b7cbe21bd55a2c02fc5aed4dd1c187b4cb91ab289a53e52d19f790b3bbc2544781ee5cc1bf1fa8ef4ecd18d4a068f +DIST amcl-9999-global_localization_stage_indexed.bag 293838 BLAKE2B 29245f1603cd25b06345f3d9144170e2e661dac63ecb3649f70a9849e71f4568bc409ab9fc519895c653146a13c116b6eabf01689b329826673230e0faadf297 SHA512 7e9ebcb34917d3960dfbe3da1d363d53d527c9006ff3c62e05faadcbec4ba9599cb5704c7f55f04ddd5613d78f2e1be72ed78473786c98c8842f93844fc1d99f +DIST amcl-9999-rosie_localization_stage.bag 3544355 BLAKE2B 8c48d0222c51d11ad759ad217bc6896aed73e4c11ddf071dfb7287247fedfaf99a6f55ac8b2e0531c4444b11bbe1b98e9de0900008e02e652ce1328920aefeab SHA512 11dd7a3e410e4903cd50b73b3954f002f366eeed0376bd3930a59677f3a7c1523bcaeccbd596961dcacfd43747668df7e11b124db4fe7cb0f02dae89a5b873a4 +DIST amcl-9999-small_loop_crazy_driving_prg_indexed.bag 11950050 BLAKE2B 4e9e5f822629ed8cd0b6e3f8f8335550edc458f10ac9d230b4dd691df6d76abeb39d5742d783ae1d2d404487eb9db17f90fe2be539b54b444a67927593679214 SHA512 c961cea0cfd5cc087ab91844f53f5d98509dd56fec5a257079c9f7b52236db5c6dafbe68035a42b91c0a99ec94fce23caf8e3c660ed609a89d7cba6c03a66fea +DIST amcl-9999-small_loop_prf_indexed.bag 8738741 BLAKE2B f28afe9c9fadd9998b61b9dc1e0bac4fe8c322a6e37d0f4195ef0f13e16fb13a78ebe9ad70d38fd979d1779c1d6117a05c376dcfc093fb2bf1252aa3437ea518 SHA512 039a4deb5533190d5502e02bd272188374d77d5e983116db80d87092a8a3c7bd1a81b9967e574c3362ab580eefceea8cdd5d8729d92a9f7c31a2b3b5eaf11a08 +DIST amcl-9999-texas_greenroom_loop_indexed.bag 1793411 BLAKE2B 05f5d9e7882f020ef22b8f0aa75be158af57493c2ba0ed0cf4463a4de0f3b1cf705613779c82b8743260ce3b3800750240eed982d75a72058398e7370441d424 SHA512 ab83fcdfb673d605e0bddba659aa9e72fd1c1f360bf0b0bd916a13a015b893f78967cca2f33cf856574fdd7dddb86ff60f41b0a36addb77ac0e8ac5c60ce1d1a +DIST amcl-9999-texas_willow_hallway_loop_indexed.bag 4737937 BLAKE2B e22fe392aa5f8b393ad2a19ee95a5612f462935981278f3e6b2f0ee3ecb0ce31b02e19d342f1166abf0bcdb72c42df7482527e86e1e3dfcd65a7efdca6bb9d3a SHA512 69cdbf6542274f25988b44fda6a5b40a905d1b9e08ad6603ccb2e3fbdf2ea6d5a8b88519856e4d04adc39c2776862d6b666c776073e562f9ae0614bc897dab3c +DIST amcl-9999-willow-full-0.05.pgm 1100980 BLAKE2B 77a0295277a86679873d8788ef37161b3847ed05e385ddad2849c06c387326a1660aa98f384420a20e40f85c2ad7a221481c07944e6d47c7d6c70918140a5cb9 SHA512 88385ca1bfe4d1b1f66a1d81beb2fc31dd48e16547156a8ee5390aed37c6407b163441b0616b5a9bbab51d42dca67ecfbd5fafbd2ba1e0150d3d2e88c6f76f02 +DIST amcl-9999-willow-full.pgm 307244 BLAKE2B 6e9c02275664bf6dca4cdd5990094452131672835a5cef8a7fdc382c6426791e57ecdf2dd73dee29a1ddc0caf751990c659e7a0d2f4aa7263e6fa37c12c43d04 SHA512 471c0aecf1dd32340f7df09121bf39564fab8a330f56b72e37d322e64a160dfa9099405688ec37b08340c148fda6c46ca302355f0d118cfcdb74a36de78c127d DIST navigation-1.17.0.tar.gz 347660 BLAKE2B 8345dccf8ac5e24d1017631bb621ebaa472cc492d6361f29938501a149555771e03a6a46e16fdcc508bbe5c206ead80e9b79e9168b873685fca50a78ea7a7e13 SHA512 a536c8826bd88151ff8f51f83661282f8ccf1b19872bd91ed32987ef372797b94489380262e79ee2560ecb4d9e290c5b4f8d52c17721e2a41126eaea909bce26 diff --git a/dev-ros/amcl/amcl-1.17.0.ebuild b/dev-ros/amcl/amcl-1.17.0.ebuild index 9f75d196536..2c628ceca1f 100644 --- a/dev-ros/amcl/amcl-1.17.0.ebuild +++ b/dev-ros/amcl/amcl-1.17.0.ebuild @@ -13,6 +13,24 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="" + +TEST_DATA=" +basic_localization_stage_indexed.bag +global_localization_stage_indexed.bag +small_loop_prf_indexed.bag +small_loop_crazy_driving_prg_indexed.bag +texas_greenroom_loop_indexed.bag +texas_willow_hallway_loop_indexed.bag +rosie_localization_stage.bag +willow-full.pgm +willow-full-0.05.pgm +" + +for i in ${TEST_DATA}; do + SRC_URI="${SRC_URI} + http://download.ros.org/data/amcl/${i} -> ${P}-${i}" +done + RDEPEND=" dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}] dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] @@ -37,3 +55,11 @@ DEPEND="${RDEPEND} ) " PATCHES=( "${FILESDIR}/cmake.patch" ) + +src_prepare() { + ros-catkin_src_prepare + for i in ${TEST_DATA}; do + cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die + done + sed -e "s#http://download.ros.org/data/amcl#file://${S}#"; -i CMakeLists.txt || die +} diff --git a/dev-ros/amcl/amcl-9999.ebuild b/dev-ros/amcl/amcl-9999.ebuild index 9f75d196536..2c628ceca1f 100644 --- a/dev-ros/amcl/amcl-9999.ebuild +++ b/dev-ros/amcl/amcl-9999.ebuild @@ -13,6 +13,24 @@ LICENSE="LGPL-2.1" SLOT="0" IUSE="" + +TEST_DATA=" +basic_localization_stage_indexed.bag +global_localization_stage_indexed.bag +small_loop_prf_indexed.bag +small_loop_crazy_driving_prg_indexed.bag +texas_greenroom_loop_indexed.bag +texas_willow_hallway_loop_indexed.bag +rosie_localization_stage.bag +willow-full.pgm +willow-full-0.05.pgm +" + +for i in ${TEST_DATA}; do + SRC_URI="${SRC_URI} + http://download.ros.org/data/amcl/${i} -> ${P}-${i}" +done + RDEPEND=" dev-ros/diagnostic_updater[${PYTHON_SINGLE_USEDEP}] dev-ros/dynamic_reconfigure[${PYTHON_SINGLE_USEDEP}] @@ -37,3 +55,11 @@ DEPEND="${RDEPEND} ) " PATCHES=( "${FILESDIR}/cmake.patch" ) + +src_prepare() { + ros-catkin_src_prepare + for i in ${TEST_DATA}; do + cp "${DISTDIR}/${P}-${i}" "${S}/${i}" || die + done + sed -e "s#http://download.ros.org/data/amcl#file://${S}#"; -i CMakeLists.txt || die +}
