From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8275F138359 for ; Wed, 29 Jul 2020 18:06:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5885AE0DA7; Wed, 29 Jul 2020 18:06:23 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 41FC4E0DA9 for ; Wed, 29 Jul 2020 18:06:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7DE9C34F450 for ; Wed, 29 Jul 2020 18:06:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9FBFD313 for ; Wed, 29 Jul 2020 18:06:17 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1596045964.e3a611e378f92e92e64c51b129c8b461eaf5484c.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/pluginlib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ros/pluginlib/pluginlib-1.13.0.ebuild dev-ros/pluginlib/pluginlib-9999.ebuild X-VCS-Directories: dev-ros/pluginlib/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: e3a611e378f92e92e64c51b129c8b461eaf5484c X-VCS-Branch: master Date: Wed, 29 Jul 2020 18:06:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9035c0d3-6974-4446-b474-46899b2bb985 X-Archives-Hash: 99d8cf2af2342a7abc81afeb6fec43d5 commit: e3a611e378f92e92e64c51b129c8b461eaf5484c Author: Alexis Ballier gentoo org> AuthorDate: Wed Jul 29 18:05:52 2020 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Wed Jul 29 18:06:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a611e3 dev-ros/pluginlib: set proper pathes for tests Closes: https://bugs.gentoo.org/624934 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Alexis Ballier gentoo.org> dev-ros/pluginlib/pluginlib-1.13.0.ebuild | 11 +++++++++++ dev-ros/pluginlib/pluginlib-9999.ebuild | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0.ebuild index ba9b469f3e1..6589477b3a3 100644 --- a/dev-ros/pluginlib/pluginlib-1.13.0.ebuild +++ b/dev-ros/pluginlib/pluginlib-1.13.0.ebuild @@ -24,3 +24,14 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) + +src_test() { + cmake_build tests + + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then + ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die + fi + export CATKIN_PREFIX_PATH=devel/ + ros-catkin_src_test +} diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild index ba9b469f3e1..6589477b3a3 100644 --- a/dev-ros/pluginlib/pluginlib-9999.ebuild +++ b/dev-ros/pluginlib/pluginlib-9999.ebuild @@ -24,3 +24,14 @@ RDEPEND=" DEPEND="${RDEPEND} test? ( dev-cpp/gtest )" PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" ) + +src_test() { + cmake_build tests + + export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}" + if [ ! -e "${BUILD_DIR}/devel/lib" ] ; then + ln -s $(get_libdir) "${BUILD_DIR}/devel/lib" || die + fi + export CATKIN_PREFIX_PATH=devel/ + ros-catkin_src_test +}