From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 May 2007 05:33:57 +0000 (-0000)
Subject: Make sure USE=test is properly enabled when the test phase is forced via the ebuild... 
X-Git-Tag: v2.2_pre1~1437
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4fb5f6d9450dafa59792fe8bd63e3e4e5c7cec95;p=portage.git

Make sure USE=test is properly enabled when the test phase is forced via the ebuild command, even when USE from ${T}/environment doen't have it.

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f4556da00..6fc32bb64 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -928,7 +928,12 @@ dyn_compile() {
 }
 
 dyn_test() {
-	[ "${EBUILD_FORCE_TEST}" == "1" ] && rm -f "${PORTAGE_BUILDDIR}/.tested"
+	if [ "${EBUILD_FORCE_TEST}" == "1" ] ; then
+		rm -f "${PORTAGE_BUILDDIR}/.tested"
+		# If USE came from ${T}/environment then it might not have USE=test
+		# like it's supposed to here.
+		! hasq test ${USE} && export USE="${USE} test"
+	fi
 	[ "$(type -t pre_src_test)" == "function" ] && qa_call pre_src_test
 	if [ "${PORTAGE_BUILDDIR}/.tested" -nt "${WORKDIR}" ]; then
 		vecho ">>> It appears that ${PN} has already been tested; skipping."