| 1 |
commit: 35fff873028857dedf712c32d0615a1c2e86e71f |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 7 18:10:57 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 7 18:10:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35fff873 |
| 7 |
|
| 8 |
dev-ros/pr2_description: fix building tests; they still fail though. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-ros/pr2_description/files/tests.patch | 13 +++++++++++++ |
| 13 |
dev-ros/pr2_description/pr2_description-1.12.0.ebuild | 3 ++- |
| 14 |
dev-ros/pr2_description/pr2_description-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 17 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-ros/pr2_description/files/tests.patch b/dev-ros/pr2_description/files/tests.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..40c3a378d45 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-ros/pr2_description/files/tests.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+Index: pr2_common-1.12.0/pr2_description/test/test_urdf.cpp |
| 24 |
+=================================================================== |
| 25 |
+--- pr2_common-1.12.0.orig/pr2_description/test/test_urdf.cpp |
| 26 |
++++ pr2_common-1.12.0/pr2_description/test/test_urdf.cpp |
| 27 |
+@@ -100,7 +100,7 @@ int walker( std::string & result, int& t |
| 28 |
+ } |
| 29 |
+ xml_file.close(); |
| 30 |
+ |
| 31 |
+- boost::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string); |
| 32 |
++ std::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string); |
| 33 |
+ if (!robot) test_result = test_result || 1; |
| 34 |
+ |
| 35 |
+ } |
| 36 |
|
| 37 |
diff --git a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild |
| 38 |
index 75466430c05..1a73af70cf0 100644 |
| 39 |
--- a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild |
| 40 |
+++ b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild |
| 41 |
@@ -1,4 +1,4 @@ |
| 42 |
-# Copyright 1999-2014 Gentoo Foundation |
| 43 |
+# Copyright 1999-2017 Gentoo Foundation |
| 44 |
# Distributed under the terms of the GNU General Public License v2 |
| 45 |
|
| 46 |
EAPI=5 |
| 47 |
@@ -19,3 +19,4 @@ DEPEND="${RDEPEND} |
| 48 |
dev-ros/convex_decomposition |
| 49 |
dev-ros/ivcon |
| 50 |
test? ( dev-libs/urdfdom dev-cpp/gtest )" |
| 51 |
+PATCHES=( "${FILESDIR}/tests.patch" ) |
| 52 |
|
| 53 |
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild |
| 54 |
index 75466430c05..1a73af70cf0 100644 |
| 55 |
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild |
| 56 |
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild |
| 57 |
@@ -1,4 +1,4 @@ |
| 58 |
-# Copyright 1999-2014 Gentoo Foundation |
| 59 |
+# Copyright 1999-2017 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
EAPI=5 |
| 63 |
@@ -19,3 +19,4 @@ DEPEND="${RDEPEND} |
| 64 |
dev-ros/convex_decomposition |
| 65 |
dev-ros/ivcon |
| 66 |
test? ( dev-libs/urdfdom dev-cpp/gtest )" |
| 67 |
+PATCHES=( "${FILESDIR}/tests.patch" ) |
Archives