summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-05-10 05:33:57 +0000
committerZac Medico <zmedico@gentoo.org>2007-05-10 05:33:57 +0000
commit4fb5f6d9450dafa59792fe8bd63e3e4e5c7cec95 (patch)
treed2cb87c85611b2726db4d518efbde7d432f21a38
parentb22edffe32827690c0a3082003fdb71e4d8366d6 (diff)
downloadportage-4fb5f6d9450dafa59792fe8bd63e3e4e5c7cec95.tar.gz
portage-4fb5f6d9450dafa59792fe8bd63e3e4e5c7cec95.tar.bz2
portage-4fb5f6d9450dafa59792fe8bd63e3e4e5c7cec95.zip
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
-rwxr-xr-xbin/ebuild.sh7
1 files changed, 6 insertions, 1 deletions
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."