Fix testsuite postprocessing for bug #245192.

Package-Manager: portage-2.2_rc26/cvs/Linux x86_64

3 files changed, 30 insertions, 13 deletions

diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index d36ba881783a..1fb590d43633 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/boost
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.144 2009/02/07 19:58:38 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/ChangeLog,v 1.145 2009/03/23 23:13:39 dirtyepic Exp $
+
+  23 Mar 2009; Ryan Hill <dirtyepic@gentoo.org> boost-1.35.0-r2.ebuild:
+  Fix testsuite postprocessing for bug #245192.
 
   07 Feb 2009; Tobias Klausmann <klausman@gentoo.org>
   boost-1.35.0-r1.ebuild:
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 9a934c364c1c..3de15bf02fa0 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX boost-1.33.1-gcc41_visit_each.patch 338 RMD160 295e85b70cb27da6bb24eb6d757c8cc3465877d7 SHA1 265bdab2f664ffaa23f340f78a99506616457ad6 SHA256 a9ced5f54e52ade899a7b09dff097e4c9ca958c85d51ae431c7e7521f53b441e
 AUX boost-alpha-threads.patch 1111 RMD160 49fe6128f6dd9277389d25a83706b401705cdb40 SHA1 846f8a187dca02a998fb60bd298d2312e16620f0 SHA256 e7d1cb78cc73763023edb80cdb66e2a9389d9ef40f448be60cf8cd4f827e7623
 AUX random-Jamfile 355 RMD160 478b592e9d33d371b07e5364e63512c8208263bf SHA1 8ca047df78758f62a6c131bd27441173e9079fa6 SHA256 7dc71ab8b862ccd5ea9c21c42557adfe0c711ea7fbe7faa47328a37aa84bc096
@@ -17,10 +20,17 @@ DIST boost_1_37_0.tar.bz2 29435646 RMD160 3c4cf7eb97a8fb126e564ba529ed9edec87651
 EBUILD boost-1.33.1-r1.ebuild 6932 RMD160 c691b8884b08981841808ece5406d13ae183e6f1 SHA1 a2b6291153f5e786d2e4902671571b0d1382bc1d SHA256 e55587d607edd5ecdeacebfc37b211b34d8a1870e77824206f945b44ad2bc6f5
 EBUILD boost-1.34.1-r2.ebuild 6934 RMD160 844596da0fb1f4178c296344b7f10598c4c7c3f5 SHA1 f73a26cd6fd3f004a76ca57cf0ebdb9ca62e91fd SHA256 80e76b2b6ed7204287813316726b5e207171ecb3408229bcef1f9490622c2d85
 EBUILD boost-1.35.0-r1.ebuild 7022 RMD160 d81ddab27b1962e2f432e1f8268bf24205b11b13 SHA1 85ceecf41826e1f570680430c80d4769c9bf37f5 SHA256 7321e22569df9ba80e081b2addbf4aeced85f6466243cbe865a1bb27972f3a65
-EBUILD boost-1.35.0-r2.ebuild 7023 RMD160 6077474ab94d662e4a68e473356fa6370e45cdbb SHA1 55f2efbfe6ea0b60166ed80f8e244905f91f77d5 SHA256 ba19312a63f58fee47410afd6a4df2f004d3e7e789f063256a36f0e481426ca5
+EBUILD boost-1.35.0-r2.ebuild 7236 RMD160 5744dda4178f26e47e3e676a6b4470822a2a52bd SHA1 d50d6c8acc0f33d88fc6d34ccb1060a8da385e90 SHA256 df700a45c54f454b3039513356bba15934ce25ba4dadd9ec0530cfe201846153
 EBUILD boost-1.35.0-r3.ebuild 7824 RMD160 88e1b05e8b1d0e0945dd59d05714e4e6356c887a SHA1 268bd74ddd1d1f9121f89f4d4c839deba8281d52 SHA256 5ee74ced5a0a36d37b7237b03c0950c6350b1e4daf9772ca1c2642cb8938e268
 EBUILD boost-1.35.0-r4.ebuild 7824 RMD160 c9c8cc8f72da6655d354554c84bbb439049efeef SHA1 af1065b9c3ff3132551a42abeb5f22958c9cf49f SHA256 e4a30a59dd05ee0bcabd9b8bd0c27500df77eb88d0988ca90506fd54aeb72951
 EBUILD boost-1.36.0.ebuild 8038 RMD160 ba9ece93374223722e2e31391a80dc52eafd871a SHA1 1938df70a6ca5039d3e92eb82ac2c02acdd737a3 SHA256 942fe86454a27781f6b7eb6e0576a2bf6957e64dd7ac7c3d8d33af37c760482b
 EBUILD boost-1.37.0.ebuild 8038 RMD160 302e7f4a6d26c4315be4673efaef061aafa6cb6c SHA1 4207bfdb16adc45a9a3e7106c89eb9f4e4cf4914 SHA256 4b3149f432db3442e35bc535a85f9dd9740ff82b121ef6496b6d064b9b049f7e
-MISC ChangeLog 20565 RMD160 2852a37755addb9a64d1ef022247b3109bb2e10c SHA1 9ac3ef1a51b15e18855bd8bbf2f93ec3bb958993 SHA256 6727a577a9fd0d2fa3c4a30dc61b7b73cd10e259f14909d67e6376b0df080ddc
+MISC ChangeLog 20687 RMD160 aad23144a89b8381f0ee366bc1928a4fb604fab6 SHA1 9d2db5c5b5b8f7e17b02e1d5e9059a2c42d89327 SHA256 8f31f0314360afff4a50f1e3d40fcdc9a95118d0b5fd3a998b8cfb5aa585164c
 MISC metadata.xml 787 RMD160 fe27158298f4e49b13000109800ad3bd43c2ea34 SHA1 389ddd485476b37dfee2c486ef56fe8a0d3fd185 SHA256 2aece4cb1aa96f17b1e4353f1aa6617cfc81255466b7e5a01eaabec68e5d7e85
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAknIGAgACgkQiqiDRvmkBmK3cACgzyv4hN0bAwFJ8+5y0oWpS+VH
+qf0AoKv916Ubow8t9Leaj1vE1hgkpY39
+=nvPx
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/boost/boost-1.35.0-r2.ebuild b/dev-libs/boost/boost-1.35.0-r2.ebuild
index b3deab4f1a85..18383dc74486 100644
--- a/dev-libs/boost/boost-1.35.0-r2.ebuild
+++ b/dev-libs/boost/boost-1.35.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.1 2008/09/01 18:37:20 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/boost/boost-1.35.0-r2.ebuild,v 1.2 2009/03/23 23:13:39 dirtyepic Exp $
 
 inherit python flag-o-matic multilib toolchain-funcs versionator check-reqs
 
@@ -35,11 +35,11 @@ pkg_setup() {
 	if has test ${FEATURES} ; then
 		CHECKREQS_DISK_BUILD="1024"
 		check_reqs
-
-		ewarn "The tests may take several hours on a recent machine"
-		ewarn "but they will not fail (unless something weird happens ;-)"
-		ewarn "This is because the tests depend on the used compiler/-version"
-		ewarn "and the platform and upstream says that this is normal."
+		ewarn "The testsuite may take several hours to run on a modern system."
+		ewarn "It is normal to see some tests failing, as some are dependent"
+		ewarn "on compiler version and platform.  Unless something weird"
+		ewarn "happens, the ebuild should continue installing as normal."
+		ewarn
 		ewarn "If you are interested in the results, please take a look at the"
 		ewarn "generated results page:"
 		ewarn "  ${ROOT}usr/share/doc/${PF}/status/cs-$(uname).html"
@@ -73,7 +73,7 @@ generate_options() {
 	# Using optimization=off would for example add
 	# "-O0" and override "-O2" set by the user.
 	# Please take a look at the boost-build ebuild
-	# for more infomration.
+	# for more information.
 
 	OPTIONS="gentoorelease"
 	use debug && OPTIONS="gentoodebug"
@@ -157,6 +157,7 @@ src_compile() {
 			${OPTIONS} \
 			--prefix="${D}/usr" \
 			--layout=system \
+			process_jam_log compiler_status \
 			|| die "building regression test helpers failed"
 	fi
 
@@ -247,7 +248,10 @@ src_test() {
 		--dump-tests 2>&1 | tee regress.log
 
 	# Postprocessing
-	cat regress.log | "${S}/dist/bin/process_jam_log" --v2
+	process_jam_log=$(find "${S}"/tools/regression/build/bin -name process_jam_log -print);
+	compiler_status=$(find "${S}"/tools/regression/build/bin -name compiler_status -print);
+
+	cat regress.log | "${process_jam_log}" --v2
 	if test $? != 0 ; then
 		die "Postprocessing the build log failed"
 	fi
@@ -257,7 +261,7 @@ src_test() {
 __EOF__
 
 	# Generate the build log html summary page
-	"${S}/dist/bin/compiler_status" --v2 \
+	"${compiler_status}" --v2 \
 		--comment "${S}/status/comment.html" "${S}" \
 		cs-$(uname).html cs-$(uname)-links.html
 	if test $? != 0 ; then