Make the tests work reliably #405293 by Patrick Lauer.

Package-Manager: portage-HEAD/cvs/Linux x86_64

3 files changed, 47 insertions, 4 deletions

diff --git a/sys-apps/keyutils/ChangeLog b/sys-apps/keyutils/ChangeLog
index 026b15d76e15..abba31de7c92 100644
--- a/sys-apps/keyutils/ChangeLog
+++ b/sys-apps/keyutils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/keyutils
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.27 2012/02/21 08:14:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/ChangeLog,v 1.28 2012/05/25 04:33:05 vapier Exp $
+
+  25 May 2012; Mike Frysinger <vapier@gentoo.org> keyutils-1.5.5.ebuild:
+  Make the tests work reliably #405293 by Patrick Lauer.
 
 *keyutils-1.5.5 (21 Feb 2012)
 
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 0b96497666b4..bae9c24fdf68 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX keyutils-1.2-makefile-fixup.patch 1059 RMD160 9216207704fbe7cb91bbb1e2e64628be6bef70b7 SHA1 3256837557e6f4ba806e6705562c8ab5ffab72c2 SHA256 77e27c53659c6f26e681cf471a662275ef6b97ed02950ffc6365b3955e2b0beb
 AUX keyutils-1.5.3-makefile-fixup.patch 1512 RMD160 7ef9b27fcee69fd29c9f788a2ab551fadd29fdd2 SHA1 ed0c56e9a1dce1445430ef2637f40e216f07b226 SHA256 add2a6d8bcdbe562bb977e97c37759a4af7e19a3b8c2562b18937ab7deee6286
 AUX keyutils-1.5.5-makefile-fixup.patch 879 RMD160 5143d1407b9571917325d226915933adef820853 SHA1 bb08e23ba08b9cd3a21393bdd83024b3ecebaa4d SHA256 b68e7fab7293c680e5f44f3b116622b2d7dba2039e849ec53ab577c4e12f3a5b
@@ -15,6 +18,23 @@ EBUILD keyutils-1.2.ebuild 774 RMD160 a55660d2c999c78336cf466e5a2dd879e7ae6caf S
 EBUILD keyutils-1.4-r1.ebuild 1106 RMD160 7de77375becc4454efedc872fccb67a05e7ba82d SHA1 dd254dd30332272dd5f78a7b51c6b499033d4502 SHA256 452acb493387e2372c5d1cc838923800620a7bad802e437b55fc2629173c46e3
 EBUILD keyutils-1.4.ebuild 1026 RMD160 8f7b66a04ff5cf8d2faaee91782bea55948244e6 SHA1 65e9e8c6a3caa0b15037e6dd1547ec5f9142c820 SHA256 9b26b4848484f8c5d16241e5d2f822356c6b0765ce0da4e3677b651b71eedd95
 EBUILD keyutils-1.5.3.ebuild 1090 RMD160 58de3a6d742904ce5a6ce468120cb7234293dc3e SHA1 23c89c7eabb2d342becb312bda22cdb3af1e06f7 SHA256 a8b4715ed752d0fe311820454f28f5d16d3a82667cc0906a0e859c1a4ee0a57d
-EBUILD keyutils-1.5.5.ebuild 1091 RMD160 1a3f77d643d755ba5a34bd6c8de1947154423351 SHA1 9875c03a71ec45829135ae114fbf1a3b092be417 SHA256 8e08b5f838f304bad06923cfae0e62a36ccafca671f8158749030c43b203eb50
-MISC ChangeLog 3836 RMD160 e6c41857df2cce0be5bd1989afe4918472751194 SHA1 72c1ca8c4a8c43cdb3f3d4c014df195e3c9a793d SHA256 4e751531cccf0f4ae05cc953c328f5360c3dacce5f08b672a2284a927e58c9a5
+EBUILD keyutils-1.5.5.ebuild 1847 RMD160 d2f09421ed3afa0f8d26c26cc39aa9024f3a3a08 SHA1 16cfd0def3c206dfdb0abdff1dea3289fbeee8ac SHA256 9d4fee9820884f0461d57b648bd5c115ab2546e188b91565fcf45483059f65f6
+MISC ChangeLog 3966 RMD160 462b06c71b1ddf66c7e90f6d9565240b590c8048 SHA1 721bd267adff14c87ffbc272f84149b6307eef21 SHA256 a9f265ac5273ed813f3b4914f7e23aa385de484eaf3bc7932885b896a4c10f01
 MISC metadata.xml 227 RMD160 e54f63c709ba122fa8d5931652deb3821a967981 SHA1 84c05df3fda91de26beaaf15ffdbf4ea15b3784b SHA256 eb6179099f91f31168c95bd4a018a01f37aa1eb8d9ba8d3ed039056bac71bcf8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBAgAGBQJPvwvbAAoJELEHsLL7fEFWFQ0P/j5bYNkMNsLn7OQqo8Qv4Lnd
+C+1RaVH0+I+nhhrKwo57/Wy6LM5SPPZxTNO+0GJTGam3ZCpO6MX3eYh9KD6Y0yx4
+8k7heaONciVxBbc4fC+dYpFcY4W1132Q/sIgnOayep6S9lNiRAQ2eRS5xYWG5udQ
+v8j7oGL10DIUFtgdHO8cjuAscRWdGxZ/JB8NTNLTmPZMl87zNQdecCNTgvwj5Squ
+baWpY4SKiMLwDuaJk515QWH7FzGf8PnxoZMUBcQTh+lOgAZ+qzVTns1/9S5+iqhu
+YM2ukLQumZn5MwL05VPrR1rM3aKvWzyOKojfA5Cr6v+ux75CAkfhMclBOymmtv4Y
+JC7CVQlbai9/50vzrzKLaG2MGiOdbvJrosUzxapph/WWqyB+dmvXDF3fFo6m62jn
+RwaSHQZtKEmstT+25CXGuaxl22XBj0g650aVOVv/bwdT0IvXubWh/KcS07IBhBxw
+2qlo+gjC89LF81YCrO6f4cAozfG0Fkukj+pP47Lljlohi8wYkS+HzceEpKu5MIkO
+kutFM9EY1azVVOMXjyBbszXw2SP1psrSQd+YyFqjrNF2WlDLyQq4sW6ixbAAJF9e
+jNgzKzGtodUPI0++rYhSmovrSq0ph16ACfo142MVHLbDuWxb2FiS+gbLdn6/WHMS
+9g7uAbIHtmRW5Dybuf/e
+=Ot3a
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/keyutils/keyutils-1.5.5.ebuild b/sys-apps/keyutils/keyutils-1.5.5.ebuild
index 3d4dd960f81d..6459b9b2d427 100644
--- a/sys-apps/keyutils/keyutils-1.5.5.ebuild
+++ b/sys-apps/keyutils/keyutils-1.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.1 2012/02/21 08:14:32 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/keyutils/keyutils-1.5.5.ebuild,v 1.2 2012/05/25 04:33:05 vapier Exp $
 
 EAPI="3"
 
@@ -27,12 +27,32 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/usr/$(get_libdir):" \
 		-e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \
 		Makefile || die
+
+	# The lsb check is useless, so avoid spurious command not found messages.
+	sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die
+	# All the test files are bash, but try to execute via `sh`.
+	sed -i -r \
+		-e 's:([[:space:]])sh([[:space:]]):\1bash\2:' \
+		tests/{Makefile*,*.sh} || die
+	find tests/ -name '*.sh' -exec sed -i '1s:/sh$:/bash:' {} +
+	# Some tests call the kernel which calls userspace, but that will
+	# run the install keyutils rather than the locally compiled one,
+	# so disable round trip tests.
+	rm -rf tests/keyctl/requesting/{bad-args,piped,valid}
 }
 
 src_configure() {
 	tc-export CC
 }
 
+src_test() {
+	# Execute the locally compiled code rather than the
+	# older versions already installed in the system.
+	LD_LIBRARY_PATH=${S} \
+	PATH="${S}:${PATH}" \
+	emake test || die
+}
+
 src_install() {
 	emake DESTDIR="${ED}" install || die
 	dodoc README