* [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_test.eblit
@ 2013-04-11 20:42 Mike Frysinger (vapier)
0 siblings, 0 replies; only message in thread
From: Mike Frysinger (vapier) @ 2013-04-11 20:42 UTC (permalink / raw
To: gentoo-commits
vapier 13/04/11 20:42:56
Modified: src_test.eblit
Log:
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)
Revision Changes Path
1.5 sys-libs/glibc/files/eblits/src_test.eblit
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit?r1=1.4&r2=1.5
Index: src_test.eblit
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_test.eblit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- src_test.eblit 10 Aug 2010 08:08:05 -0000 1.4
+++ src_test.eblit 11 Apr 2013 20:42:56 -0000 1.5
@@ -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 @@
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 @@
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
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-04-11 20:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-11 20:42 [gentoo-commits] gentoo-x86 commit in sys-libs/glibc/files/eblits: src_test.eblit Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox