From 8d8cb4180aa4b5f69f5a4d6b9df3e2b7ede42b06 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 1 Mar 2007 02:10:10 +0000
Subject: [PATCH] fix from Kevin Quinn to run through as much of src_test as
 possible Package-Manager: portage-2.1.2-r12

---
 sys-libs/glibc/Manifest         | 18 ++++++++++++++----
 sys-libs/glibc/glibc-2.5.ebuild | 20 +++++++++++++++-----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 48127bf1b283..00ebec38c509 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a
 MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823
@@ -489,10 +492,10 @@ EBUILD glibc-2.4-r4.ebuild 39210 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676
 MD5 f7e1022963b4ac00d04110ef57c1a0eb glibc-2.4-r4.ebuild 39210
 RMD160 fd782b08e862bd1889b9d6dc73386f6ff43ce676 glibc-2.4-r4.ebuild 39210
 SHA256 d05fc7bf0c6cd701443f61328afb4e80ce6ff6d7d364de346cfdc297ffedc5df glibc-2.4-r4.ebuild 39210
-EBUILD glibc-2.5.ebuild 37435 RMD160 1a1a4cec91a4dac0630a880d5b723af37097e530 SHA1 fac4703ded18188425d784cb495b3221ab3f329e SHA256 03f1ac0642f1ff7cbb7bfab69172fb077aa2244297dc43d8af48772f308f3d92
-MD5 1fbb6f3e53f8509cb6e772bdc061188a glibc-2.5.ebuild 37435
-RMD160 1a1a4cec91a4dac0630a880d5b723af37097e530 glibc-2.5.ebuild 37435
-SHA256 03f1ac0642f1ff7cbb7bfab69172fb077aa2244297dc43d8af48772f308f3d92 glibc-2.5.ebuild 37435
+EBUILD glibc-2.5.ebuild 37691 RMD160 f0523cfa8e224066441ae73546da6380eb1c5016 SHA1 e177fee08fa6070928a7cd6bd679d5123c58cbc5 SHA256 e608a9d390e24ee8bfd50e889b276333160d5d7850a6f281c389e7b6b8ec11aa
+MD5 ee361fce8e092d9ab35fdac2067f8b74 glibc-2.5.ebuild 37691
+RMD160 f0523cfa8e224066441ae73546da6380eb1c5016 glibc-2.5.ebuild 37691
+SHA256 e608a9d390e24ee8bfd50e889b276333160d5d7850a6f281c389e7b6b8ec11aa glibc-2.5.ebuild 37691
 MISC ChangeLog 99099 RMD160 00dd5b6474523bf1c9d9c10ef508c5aff45494ff SHA1 79aa024a9d080579a44aa293e724a191b03cea92 SHA256 28d3f4aeab543ee75b42a1474ab2b40c57917e08f076fe432225dc54d612d364
 MD5 82e748bdabd35a7dca824001b508a94d ChangeLog 99099
 RMD160 00dd5b6474523bf1c9d9c10ef508c5aff45494ff ChangeLog 99099
@@ -525,3 +528,10 @@ SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/di
 MD5 5b7e320e8b8b1a96ace60aa95385c122 files/digest-glibc-2.5 1286
 RMD160 6302561abceb3a88449dfe74bd6f2e373f00dec3 files/digest-glibc-2.5 1286
 SHA256 c20b8f42085597085e3589fbfd2dc5351f0c63a5492a55f82b59a1481b2a28f3 files/digest-glibc-2.5 1286
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5jZh8bi6rjpTunYRAoQcAJ4wTUzzpH2YP+xATVa4MkvI8D1piQCgxYzP
+83ZFUuTkw99ElMGYikaqKFM=
+=KLMk
+-----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.5.ebuild b/sys-libs/glibc/glibc-2.5.ebuild
index 04297d70bde6..d95a75dc9776 100644
--- a/sys-libs/glibc/glibc-2.5.ebuild
+++ b/sys-libs/glibc/glibc-2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.36 2007/02/25 19:52:18 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5.ebuild,v 1.37 2007/03/01 02:10:10 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -269,7 +269,11 @@ toolchain-glibc_headers_compile() {
 toolchain-glibc_src_test() {
 	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1"
 	unset LD_ASSUME_KERNEL
-	make check || die "make check failed for ${ABI}-${CTARGET}-$1"
+	make check && return 0
+	einfo "make check failed - re-running with --ignore-errors to get the rest of the results"
+	make -k check
+	ewarn "make check failed for ${ABI}-${CTARGET}-$1"
+	return 1
 }
 
 toolchain-glibc_pkg_preinst() {
@@ -1125,6 +1129,8 @@ src_compile() {
 }
 
 src_test() {
+	local ret=0
+
 	setup_env
 
 	if [[ -z ${OABI} ]] && has_multilib_profile ; then
@@ -1134,14 +1140,18 @@ src_test() {
 			export ABI
 			einfo "   Testing ${ABI} glibc"
 			src_test
+			((ret+=$?))
 		done
 		ABI=${OABI}
 		unset OABI
-		return 0
+		[[ ${ret} -ne 0 ]] \
+			&& die "tests failed" \
+			|| return 0
 	fi
 
-	want_linuxthreads && toolchain-glibc_src_test linuxthreads
-	want_nptl && toolchain-glibc_src_test nptl
+	want_linuxthreads && toolchain-glibc_src_test linuxthreads ; ((ret+=$?))
+	want_nptl && toolchain-glibc_src_test nptl ; ((ret+=$?))
+	return ${ret}
 }
 
 src_strip() {
-- 
2.26.2