From 909e2f009419e7a3aff3007e682846030840fb9b Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 10 May 2007 05:35:04 +0000
Subject: 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.
 (trunk r6512:6513)

svn path=/main/branches/2.1.2/; revision=6514
---
 bin/ebuild.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index bacb21b28..1f4877761 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1003,7 +1003,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."
-- 
cgit v1.2.3-1-g7c22