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 <gentoo-commits+bounces-418635-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1RnAzV-00024U-Fh
	for garchives@archives.gentoo.org; Tue, 17 Jan 2012 15:30:31 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BC9ACE096A;
	Tue, 17 Jan 2012 15:30:21 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 86AD7E096A
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Jan 2012 15:30:21 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 08B6A1B4018
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Jan 2012 15:30:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 49CF980042
	for <gentoo-commits@lists.gentoo.org>; Tue, 17 Jan 2012 15:30:20 +0000 (UTC)
From: "Zac Medico" <zmedico@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org>
Message-ID: <e738400f07fbe369af0d6179fb8761ff22c95f39.zmedico@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/phase-helpers.sh
X-VCS-Directories: bin/
X-VCS-Committer: zmedico
X-VCS-Committer-Name: Zac Medico
X-VCS-Revision: e738400f07fbe369af0d6179fb8761ff22c95f39
Date: Tue, 17 Jan 2012 15:30:20 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 6c8cd4f1-e3bb-46d2-93f9-48fb7542cca8
X-Archives-Hash: ceb83ec84b8616ae4b2e7f97ffd00c9d

commit:     e738400f07fbe369af0d6179fb8761ff22c95f39
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 15:30:11 2012 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 15:30:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a=
=3Dcommit;h=3De738400f

_eapi0_src_test: remove redundant FEATURES checks

---
 bin/phase-helpers.sh |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bin/phase-helpers.sh b/bin/phase-helpers.sh
index 969cecf..d65845e 100644
--- a/bin/phase-helpers.sh
+++ b/bin/phase-helpers.sh
@@ -546,15 +546,12 @@ _eapi0_src_test() {
 	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_cmd -j1 check; then
-			has test $FEATURES && die "Make check failed. See above for details."
-			has test $FEATURES || eerror "Make check failed. See above for detail=
s."
-		fi
+		$emake_cmd -j1 check || \
+			die "Make check failed. See above for details."
 	elif $emake_cmd -j1 test -n &> /dev/null; then
 		vecho ">>> Test phase [test]: ${CATEGORY}/${PF}"
-		if ! $emake_cmd -j1 test; then
-			has test $FEATURES && die "Make test failed. See above for details."
-			has test $FEATURES || eerror "Make test failed. See above for details=
."
+		$emake_cmd -j1 test || \
+			die "Make test failed. See above for details."
 		fi
 	else
 		vecho ">>> Test phase [none]: ${CATEGORY}/${PF}"