| 1 |
commit: 781388a6d8bc37beb41f60b0e3087b8ed2fe1b91 |
| 2 |
Author: Robert Förster <Dessa <AT> gmake <DOT> de> |
| 3 |
AuthorDate: Sun Apr 15 10:51:04 2018 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 26 13:45:06 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781388a6 |
| 7 |
|
| 8 |
dev-libs/Ice: fix USE=ruby, restrict tests for now |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/636834 |
| 11 |
Closes: https://bugs.gentoo.org/649850 |
| 12 |
Closes: https://bugs.gentoo.org/654070 |
| 13 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
| 14 |
|
| 15 |
dev-libs/Ice/Ice-3.6.3-r1.ebuild | 20 ++++++++++++++------ |
| 16 |
1 file changed, 14 insertions(+), 6 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild |
| 19 |
index a2eb14ae312..4955f0858ef 100644 |
| 20 |
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild |
| 21 |
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild |
| 22 |
@@ -30,6 +30,7 @@ LICENSE="GPL-2" |
| 23 |
SLOT="0/36" |
| 24 |
KEYWORDS="amd64 ~arm x86" |
| 25 |
IUSE="doc examples libressl +ncurses mono php python ruby test debug" |
| 26 |
+RESTRICT="test" |
| 27 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 28 |
|
| 29 |
RDEPEND=">=dev-libs/expat-2.0.1 |
| 30 |
@@ -114,12 +115,14 @@ src_prepare() { |
| 31 |
-e '/SUBDIRS/s|\ test||' \ |
| 32 |
csharp/Makefile || die "sed failed" |
| 33 |
|
| 34 |
- # IceUtil/stacktrace fails with USE=debug |
| 35 |
# skip udp test due to multicast |
| 36 |
+ # skip IceGrid/admin bug #649850 |
| 37 |
# skip IceSSL tests due to requirement of internet connection |
| 38 |
+ # skip IceStorm/single bug #636834 |
| 39 |
# IceStorm/stress fails without USE=debug |
| 40 |
+ # IceUtil/stacktrace fails with USE=debug |
| 41 |
sed -i \ |
| 42 |
- -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \ |
| 43 |
+ -e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \ |
| 44 |
cpp/Makefile || die "sed failed" |
| 45 |
|
| 46 |
# mainly broken .ice files |
| 47 |
@@ -131,6 +134,11 @@ src_prepare() { |
| 48 |
sed -i \ |
| 49 |
-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \ |
| 50 |
ruby/Makefile || die "sed failed" |
| 51 |
+ |
| 52 |
+ # fix for x86 IceBox test |
| 53 |
+ sed -i \ |
| 54 |
+ -e 's|"32"|""|' \ |
| 55 |
+ scripts/TestUtil.py || die "sed failed" |
| 56 |
} |
| 57 |
|
| 58 |
src_configure() { |
| 59 |
@@ -182,16 +190,16 @@ src_configure() { |
| 60 |
|
| 61 |
# make it use ruby23 only |
| 62 |
sed -i \ |
| 63 |
- -e 's|RUBY = ruby|\022|' \ |
| 64 |
+ -e 's|RUBY = ruby|\023|' \ |
| 65 |
ruby/config/Make.rules || die "sed failed" |
| 66 |
sed -i \ |
| 67 |
- -e 's|env ruby|\022|' \ |
| 68 |
+ -e 's|env ruby|\023|' \ |
| 69 |
ruby/config/s2rb.rb || die "sed failed" |
| 70 |
sed -i \ |
| 71 |
- -e 's|env ruby|\022|' \ |
| 72 |
+ -e 's|env ruby|\023|' \ |
| 73 |
ruby/scripts/slice2rb || die "sed failed" |
| 74 |
sed -i \ |
| 75 |
- -e 's|output.write("ruby|\022|' \ |
| 76 |
+ -e 's|output.write("ruby|\023|' \ |
| 77 |
scripts/TestUtil.py || die "sed failed" |
| 78 |
fi |
Archives