From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 May 2006 07:47:08 +0000 (-0000)
Subject: Don't warn about RESTRICT=test unless FEATURES=test is enabled for bug #134004.
X-Git-Tag: v2.1_rc2~2
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6a8a98869bea4a992f28c3536dfbaa379adf0f29;p=portage.git

Don't warn about RESTRICT=test unless FEATURES=test is enabled for bug #134004.

svn path=/main/trunk/; revision=3389
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 5f7cd4316..31f32ed8a 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -970,11 +970,11 @@ dyn_test() {
 	if [ -d "${S}" ]; then
 		cd "${S}"
 	fi
-	if hasq test $RESTRICT; then
+	if ! hasq test $FEATURES; then
+		vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
+	elif hasq test $RESTRICT; then
 		ewarn "Skipping make test/check due to ebuild restriction."
 		vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
-	elif ! hasq test $FEATURES; then
-		vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
 	else
 		src_test
 	fi