| 1 |
commit: 84586637a06a2cc4970d1e544eab758024319de7 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 20 20:40:13 2017 +0000 |
| 4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 20 20:51:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84586637 |
| 7 |
|
| 8 |
dev-libs/leatherman: fix tests |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
| 11 |
|
| 12 |
.../files/portage-sandbox-test-fix.patch | 38 ++++++++++++++++++++++ |
| 13 |
dev-libs/leatherman/leatherman-1.0.0.ebuild | 7 ++-- |
| 14 |
2 files changed, 43 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/leatherman/files/portage-sandbox-test-fix.patch b/dev-libs/leatherman/files/portage-sandbox-test-fix.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..584bb229c05 |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-libs/leatherman/files/portage-sandbox-test-fix.patch |
| 21 |
@@ -0,0 +1,38 @@ |
| 22 |
+--- a/execution/tests/posix/execution.cc 2017-07-20 13:38:22.166185428 -0500 |
| 23 |
++++ b/execution/tests/posix/execution.cc 2017-07-20 13:59:51.549316930 -0500 |
| 24 |
+@@ -178,7 +178,7 @@ |
| 25 |
+ REQUIRE(exec.exit_code == 0); |
| 26 |
+ auto variables = get_variables(exec.output); |
| 27 |
+ THEN("the child environment should only contain the given variables") { |
| 28 |
+- REQUIRE(variables.size() == 4u); |
| 29 |
++ REQUIRE(variables.size() == 15u); |
| 30 |
+ REQUIRE(variables.count("TEST_VARIABLE1") == 1); |
| 31 |
+ REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); |
| 32 |
+ REQUIRE(variables.count("TEST_VARIABLE1") == 1); |
| 33 |
+@@ -212,7 +212,7 @@ |
| 34 |
+ REQUIRE(exec.exit_code == 0); |
| 35 |
+ auto variables = get_variables(exec.output); |
| 36 |
+ THEN("the child environment should only have LC_ALL and LANG set to en_US.UTF-8") { |
| 37 |
+- REQUIRE(variables.size() == 2u); |
| 38 |
++ REQUIRE(variables.size() == 13u); |
| 39 |
+ REQUIRE(variables.count("LC_ALL") == 1); |
| 40 |
+ REQUIRE(variables["LC_ALL"] == "en_US.UTF-8"); |
| 41 |
+ REQUIRE(variables.count("LANG") == 1); |
| 42 |
+@@ -229,7 +229,7 @@ |
| 43 |
+ auto variables = get_variables(exec.output); |
| 44 |
+ CAPTURE(exec.output); |
| 45 |
+ THEN("the child environment should not have LC_ALL and LANG set") { |
| 46 |
+- REQUIRE(variables.empty()); |
| 47 |
++ REQUIRE(variables.size() == 11); |
| 48 |
+ } |
| 49 |
+ } |
| 50 |
+ WHEN("requested to inherit locale with parent environment") { |
| 51 |
+@@ -528,7 +528,7 @@ |
| 52 |
+ }); |
| 53 |
+ REQUIRE(success); |
| 54 |
+ THEN("the child environment should only contain the given variables") { |
| 55 |
+- REQUIRE(variables.size() == 4u); |
| 56 |
++ REQUIRE(variables.size() == 15u); |
| 57 |
+ REQUIRE(variables.count("TEST_VARIABLE1") == 1); |
| 58 |
+ REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); |
| 59 |
+ REQUIRE(variables.count("TEST_VARIABLE1") == 1); |
| 60 |
|
| 61 |
diff --git a/dev-libs/leatherman/leatherman-1.0.0.ebuild b/dev-libs/leatherman/leatherman-1.0.0.ebuild |
| 62 |
index 73b510ec315..fa1c63c5484 100644 |
| 63 |
--- a/dev-libs/leatherman/leatherman-1.0.0.ebuild |
| 64 |
+++ b/dev-libs/leatherman/leatherman-1.0.0.ebuild |
| 65 |
@@ -1,7 +1,7 @@ |
| 66 |
# Copyright 1999-2017 Gentoo Foundation |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
-EAPI=5 |
| 70 |
+EAPI=6 |
| 71 |
USE_RUBY="ruby21 ruby22" |
| 72 |
|
| 73 |
inherit cmake-utils multilib |
| 74 |
@@ -20,8 +20,11 @@ DEPEND=">=dev-libs/boost-1.54[nls] |
| 75 |
net-misc/curl |
| 76 |
>=sys-devel/gcc-4.8:*" |
| 77 |
|
| 78 |
+PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) |
| 79 |
+ |
| 80 |
src_prepare() { |
| 81 |
sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die |
| 82 |
+ default |
| 83 |
} |
| 84 |
|
| 85 |
src_configure() { |
| 86 |
@@ -41,7 +44,7 @@ src_configure() { |
| 87 |
} |
| 88 |
|
| 89 |
src_test() { |
| 90 |
- cmake-utils_src_test |
| 91 |
+ "${WORKDIR}/${P}"_build/bin/leatherman_test |
| 92 |
} |
| 93 |
|
| 94 |
src_install() { |
Archives