Fix return code checking in src_test for both multilib & non-multilib builds #451922 by William Throwe.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

3 files changed, 44 insertions, 26 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 599dadcbdc11..ed1156136ae0 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog for sys-libs/glibc
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.935 2013/04/10 17:36:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.936 2013/04/11 20:42:56 vapier Exp $
+
+  11 Apr 2013; Mike Frysinger <vapier@gentoo.org> files/eblits/src_test.eblit:
+  Fix return code checking in src_test for both multilib & non-multilib builds
+  #451922 by William Throwe.
 
   10 Apr 2013; Mike Frysinger <vapier@gentoo.org>
   files/eblits/pkg_preinst.eblit, files/eblits/src_install.eblit:
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6fe4e3870001..26ccd6efa9e6 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -23,7 +23,7 @@ AUX eblits/pkg_preinst.eblit 2259 SHA256 5787997b8caa6d1ff451a406138f29bb5c84bc2
 AUX eblits/pkg_setup.eblit 3886 SHA256 be9c3dcef8315e52163b98631ea2c170c805f9accbaf5268df292574978c8e71 SHA512 6123cb9a2226c899d8e268141399686f2c2d082c81fb0c3e30f8b06ddd41e5aefe95c345a7fddf2d60c9d751cc1784350285542cd1bc0198e203c9fd74fe7a0d WHIRLPOOL 30dec2dcf28966fec5a0acef5605eaf40e5a45a74d8256ab9645f2bd090ef6bfbd1f02b753d83aa875d7b37edb6f419e22f633adb41d766593e5c4da53097dc5
 AUX eblits/src_compile.eblit 7002 SHA256 a7c926da7aed1728da9999a57a0028f210d434a04997ce0c5340d0b4e69ed883 SHA512 e53e706561c2e8fb34d0fb18ab9e70ccb1130e48a2b245948fd885245df266e013c3686c41b90116935c02210e8f31e9b515af551a8da74c3c4f871aa086c004 WHIRLPOOL b1fe74e135a397361be7b61662ebdbc42ba68f1d08b8e28301880dba0aa3ee6341a8e1bef8a63ce69ea97c39bdd7f3152956b4488b5ac73d2cf0a10feeecb4dc
 AUX eblits/src_install.eblit 8178 SHA256 2f016d3086df2c5cbfc48726bc5103e5d8b52c14415ab9130abf2bed2276734f SHA512 731af6bdd9ecb0bbce51d7a36d5fc417b69f1384de5ef908071797b3619dc7c5cacccb83c59dbcd349ef18509a9e417fffdc51776ce700b5d44b5b0bafd35ea9 WHIRLPOOL 85529b614e8b87574f9c9afadaa4cbbbbff0625aedabdd9ec99ad8206685858a9371a553e6bd0c9718365ee8540f8f2c6a66bb47c0e8264c21051f874af70603
-AUX eblits/src_test.eblit 1172 SHA256 e5a390761b7ec613460b8da26df3ffe2a137217261dd9f87f2b78c3fa2a12727 SHA512 714e17434402df975dcbcf1a2be03f0292e964b447dec480d08a2246b68768d00c2eb6821cb7eddcdb1fb7e0ff8a81aae29a17f18ab646becbc4e0d1f987606c WHIRLPOOL b23491934a0d8ed72732b23cf2104817e5309f8182a1b24b0068373ca0dc5138b1b207e3287f58b91b886053c076e01019ab8ef32c00da4e2731590fd59dae44
+AUX eblits/src_test.eblit 1278 SHA256 4cc565c9688292f1a195b4d9a5ba2d1b90ccc505e62229fc21d9fdf67d9655d5 SHA512 b058884a9ec43f047f10b6d61338366388dfb58c920e3f55baa85a9795750af7b8eafba427bb8ec59b1269853a4e4135b86a951f6513f64304461364b6f36a6f WHIRLPOOL 50b798092b0a9734767a8f9b7d3e1dc087d76e60f1dc83d6d5dde8aba48b992fb1b6eb6f07a9259b6fc4dac9bb391ab8972fd705be91ca15033d4d4144044e93
 AUX eblits/src_unpack.eblit 5166 SHA256 69712fe1caba29da644aa73d251d8574baf8b4cb240cefdb66947c88c7f6a59f SHA512 91a323ed15cdd31182d5fa01ef3bc2ba2ca4d35b3bdaaa00628ad7b8f6c9d93e9f3189332511cb689c3ed246054c461313853986148567dd71ebd3790e0e69ba WHIRLPOOL 10f9b5bda4e468b6ac111eecd7193fd8dcea3d9f4a3ba5339bcb53baba926075ab7f62f58ee979968de9246925217b621ccaa53ed7edf399a6174c869087b061
 AUX nscd 1621 SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 SHA512 3e1255ab014b3806112120000c3d2189a7c1c69dcd6639d5ce55e96bec721683a22b141982f6a6c6d44b14481c33fbbaa470863bef04e9b9eab7ccad1ddd5d95 WHIRLPOOL b7152f8d888fca13a16ea403c44eadbf1da2249dae3add11f73999259061824460a5479aa7e58c012bd737b62ecc81814109832cee33638279d90d4c08bfdbdc
 AUX nsswitch.conf 503 SHA256 6c38b8642d5da884327ad678d0351d57be3621562253bd9711394bad87e45e2d SHA512 c13714110f3ccc9a2270f51d0da9293ab19b9df368092d19b1a84d5051d888297bd9439a322eca1ea60d6d5e58952797d803a368a295f2db6d5e97e173907373 WHIRLPOOL 0d37755ba5928ff894c355b3fdcf7079f19c1cb7a4f3676634084da89c74d7175823a4659b8c66d8dc1395d086991857162822ddf977dbe8dff9a59bccab821e
@@ -79,23 +79,23 @@ EBUILD glibc-2.16.0.ebuild 7495 SHA256 3b9bbb21f548a2d53eadbaae9313d67eb324c7548
 EBUILD glibc-2.17.ebuild 6706 SHA256 2a1437296f2004bc485ab3aa175bfe1791b6fa123db95be69bdeb4d333243aac SHA512 d89d0811b05e1f4dd19b10057d995a1df9588e0c0bc395d2413cdc98e2a6612b5d0d42c850e2bbc257cc665474f4352e9561c3b8b5077edd555fdf98653d84ed WHIRLPOOL 89b0b87e04e2a525008e471348c83294921b5f13aee4dd62cbebf1c109e9a34727817bccf3f0fc2e6537e12ef760728ee4cd136da96fb84c12853021919bdf6d
 EBUILD glibc-2.9_p20081201-r3.ebuild 6770 SHA256 87e75b306b69d170c7fd6083c7a40303ea292616a810c3e5302eb13ff72932b8 SHA512 3dc0d6f0b99a1e83caa8a152bb7752b8b504324876bed83657b683c73f8a3432150cb5d3b42aea11d064ee9d1a4d1788dab6c9da11cfc5cf716c214ec145e177 WHIRLPOOL 9fec37815cd88eab81f4452e02e13b96e13b1ad8284b1be7f77213280da54a9de85275cf665307d3920e36c3bc02f6005acd5316f6f2ed3dac5b3b60a80690b0
 EBUILD glibc-9999.ebuild 6619 SHA256 523f30d0bd4fb9aef983b7e62e57239d089251d0f3907b6dfb70a00cbc0c2e6c SHA512 2d875c8434720b700bfc99836870e625b7c3010178a4a501e435832e826e7008764878d1e4f88d9f568d21f97de56589bff7984b37d3e9840f19492585cfe16f WHIRLPOOL 7da4b26e63d4f79592891ebd1cf1fb915d40049e8feeb61d9c55f7af601bfe2b7f1a03b1aed51f95be0451c90e93992920949c92ccd2401a0c129b600f5afdb9
-MISC ChangeLog 58075 SHA256 81a7958c3dc1f6839e242cf068f8fbb810ab7fa4502b0e23b33b57cadc8cb3be SHA512 fd31abd76867a1e8a76676b6698062514c773271ea754d99ad8d627424c4815bedb299bf1689d37aced2205627ff7f2b6b4ca18cb36d83a07bcfad614bedefad WHIRLPOOL f53b8804b6017cc04bca0002724cc7fe72b2cf545ba49813cad5b6a7d6d6b569a917e0c953c3c71edd35cd4bd8c4fc58f450d7b375e3592c450bdf732b7d9bbf
+MISC ChangeLog 58263 SHA256 9aaeeaaef867b682e9395ed6198aa664ffb9b63a970f6703775c6a8ef28a03f7 SHA512 66da744d515bd9c96dbc0a8cfb90d6235aa72a0913c4ad40cda0db1846d60b9e85e8d25d590e78631ad2be7b6482adead785cee6d8eefdb95be644cf246193cd WHIRLPOOL fe65869ac0d44073fee90cdffb593899b58b7272572753a9e4454594a99489d7f055c4b93f3448481c7654ba8f6723361a0a1fbc5725b0fe3807e639e3919d52
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC metadata.xml 622 SHA256 294041e034f6834a6660836d0863124713976e0f0a961673b3d07dbff3aba3dc SHA512 a86a5725e9ada64444f4c0b157d8b8237c45e3fe9ae1f7bf0a566076b9dd3f442caa41c41c710983d777d0f8f94e601d604d074bbea6d3f79c1cf9d15a623fa5 WHIRLPOOL 348ec1f0dccf48aed897acd9352cc6b933208036e62cec8511d0883bdb18a7ddd2765b1224891b2eb6ae6259d082280b95d3ed7e754347dfd1286f2d94f8d004
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRZaODAAoJELEHsLL7fEFW6ZEP/18j+l7y+CBa8KNlNetx5dHA
-8OxNoMcqSXdCDZfLHw8WRVTAPpqwaBX8HGkLPyBDkYLn/bs5qB64yFuiIQrK6qqH
-/9SQyp5560Fj15umAQVEFNEOWucPKAxHxAympbt4w60e367EoFgS/ogYEggjILDG
-TyCg2L2sxvNwOL1Q29IgtFhkE9Tpg1Sg2jLG8n2S3WbJOd0/hMZr2kfajJbpn8o6
-XXctvMlcn/HOsRaXmuDMg4vmRejXio94aO5nKi8EQz+nkKReja8a+GKbId32rCHd
-CjQWbMZNAyrCBQ17ZCNs/OMmkufAta7ihL0/VsSCkh+owm6R9sJ2l7Iwvs+lCfL9
-SIz94zYhxV/YziYCUIUZ0qgs1OPeuRtv2N7HoyUYEvykKkUCSWA1VIecvmLsoYkJ
-vV6P6P8DRd2Vr4mV39QuSLncYj6+3Bp2ks4I1+rfHSYn4HcGjTH2pT9GwxWm0FEI
-qCpQYKcAVOMmet2pQN9CV9dkzwaDjxhMkoqZHEVB7hnA4d1HWIaTZjWWt4N0OaMr
-uCQGwNtTwYOswmHrN42XEY2UxVsftFYCyH5/BjEvN71jwDHpUYTp+ZS3r6x4TKB/
-fTqRDMJqHJQKgx8odfiOLF50m++7nB6BFoAdVHwf9Dgv9P67XRb61GAeZ3MspJL2
-4k5i6ULTNyKH0JiaKCVz
-=NbD7
+iQIcBAEBCAAGBQJRZyClAAoJELEHsLL7fEFWMnoQAJGKRo2bJRLHF9WWRLf/BkpB
+JVH8hee66O4bfBjHlW5QS+XlcsiiZzNdMiEKxY27gLIIBhC0o8UE9R1+nG5JB7QX
+W3+S42bW38I0peYYZCS4YAONxfu6KjNTk7CKxtHQR7GG5hcnb3qoXlJDmOY3mUIp
+7sFOiSkTNhyK+Ip7acEiVZdnqKPgXDfpakItj/UmRS2ciQCGMPqSpoSON6Ws2laH
+QjhGu3aaB6Rkcd6k1tIxYy09hGSSi1mrdSLqLjQbXrScD97Bi5sV21aF2zxnpJQZ
+46KuYpW6wyiLPRdQIUlN/lkMlVMi8cqHR7WiNPoimEYe+gd4BNoZdUEdFf9+cJOF
+4lon+mNh/pkd4G1GduqKkqCv3UhRs610VZgwuHyV6PK5e5BBK/mel/VHJHoDmLbL
+rus9KvsTMyslchKAnB3do56SAkJN/+BpBgn4Ix+0ixOE4Yi2K90MxkCXxQLwmgsR
+QRhs/n3pNTLFr3NZGcmynKO+IehoMjBp7BWRvaaCo7nTkeJoq1l/XdufNN0fbMET
+uyWEJ9lj7eRtdL1nUILiFZrcXsS7377plgel4AzfdCwG9YKbQtOFRcvsygK9XSaX
+oBymioB/q/BL+YBi2bynZ3dZE3g1yYqNYWX72Uk0diqHUsP/ZwXCpxU6YCRQIQde
+wzBWI8U8vFlDbd7+tlja
+=F2Yl
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/files/eblits/src_test.eblit b/sys-libs/glibc/files/eblits/src_test.eblit
index edcdac71de99..532bc8ce0911 100644
--- a/sys-libs/glibc/files/eblits/src_test.eblit
+++ b/sys-libs/glibc/files/eblits/src_test.eblit
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.4 2010/08/10 08:08:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v 1.5 2013/04/11 20:42:56 vapier Exp $
 
 toolchain-glibc_src_test() {
 	cd "${WORKDIR}"/build-${ABI}-${CTARGET}-$1 || die "cd build-${ABI}-${CTARGET}-$1"
@@ -17,6 +17,14 @@ eblit-glibc-src_test() {
 
 	setup_env
 
+	_maybe_die() {
+		if [[ -n ${OABI} ]] ; then
+			return ${ret}
+		elif [[ ${ret} -ne 0 ]] ; then
+			die "tests failed"
+		fi
+	}
+
 	# give tests more time to complete
 	export TIMEOUTFACTOR=5
 
@@ -26,17 +34,23 @@ eblit-glibc-src_test() {
 		for ABI in $(get_install_abis) ; do
 			export ABI
 			einfo "   Testing ${ABI} glibc"
-			src_test
-			((ret+=$?))
+			eblit-glibc-src_test
+			: $(( ret += $? ))
 		done
 		ABI=${OABI}
 		unset OABI
-		[[ ${ret} -ne 0 ]] \
-			&& die "tests failed" \
-			|| return 0
+
+		_maybe_die
+		return
 	fi
 
-	want_linuxthreads && toolchain-glibc_src_test linuxthreads ; ((ret+=$?))
-	want_nptl && toolchain-glibc_src_test nptl ; ((ret+=$?))
-	return ${ret}
+	local t
+	for t in linuxthreads nptl ; do
+		if want_${t} ; then
+			toolchain-glibc_src_test ${t}
+			: $(( ret += $? ))
+		fi
+	done
+	_maybe_die
+	return
 }