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

(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

2 files changed, 29 insertions, 11 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/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
 }