From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PmEz5-0007wR-NR for garchives@archives.gentoo.org; Mon, 07 Feb 2011 00:29:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1EB6E09C7; Mon, 7 Feb 2011 00:29:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B4F6DE09C7 for ; Mon, 7 Feb 2011 00:29:31 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00F861B4045 for ; Mon, 7 Feb 2011 00:29:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6C44E8006A for ; Mon, 7 Feb 2011 00:29:30 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <997e00c3ae05c543f03085e6f9d87cc062c67d8a.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:2.1.9 commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/ebuild.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 997e00c3ae05c543f03085e6f9d87cc062c67d8a Date: Mon, 7 Feb 2011 00:29:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 117989dc2a3c606d6efcad71cc8fc8b5 commit: 997e00c3ae05c543f03085e6f9d87cc062c67d8a Author: Zac Medico gentoo org> AuthorDate: Sun Feb 6 23:00:47 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Feb 7 00:29:03 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D997e00c3 default_src_test: handle EAPI 4 emake failure This will fix bug #353897. --- bin/ebuild.sh | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index a8ed745..ebe2c65 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -626,15 +626,21 @@ _eapi0_src_compile() { } =20 _eapi0_src_test() { - if emake -j1 check -n &> /dev/null; then + # Since we don't want emake's automatic die + # support (EAPI 4 and later), and we also don't + # want the warning messages that it produces if + # we call it in 'nonfatal' mode, we use emake_cmd + # to emulate the desired parts of emake behavior. + local emake_cmd=3D"${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" + if $emake_cmd -j1 check -n &> /dev/null; then vecho ">>> Test phase [check]: ${CATEGORY}/${PF}" - if ! emake -j1 check; then + if ! $emake_cmd -j1 check; then hasq test $FEATURES && die "Make check failed. See above for details.= " hasq test $FEATURES || eerror "Make check failed. See above for detai= ls." fi - elif emake -j1 test -n &> /dev/null; then + elif $emake_cmd -j1 test -n &> /dev/null; then vecho ">>> Test phase [test]: ${CATEGORY}/${PF}" - if ! emake -j1 test; then + if ! $emake_cmd -j1 test; then hasq test $FEATURES && die "Make test failed. See above for details." hasq test $FEATURES || eerror "Make test failed. See above for detail= s." fi