summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-01-14 21:56:00 +0000
committerZac Medico <zmedico@gentoo.org>2007-01-14 21:56:00 +0000
commit8a4d81e8798f90a7a8d705cea08e053c56a4575b (patch)
tree04a41724fefd360d7a3bc8d14a917852d460e68f
parentbc8a8705ef2b7c8709431ba82eee2241a2047ae3 (diff)
downloadportage-8a4d81e8798f90a7a8d705cea08e053c56a4575b.tar.gz
portage-8a4d81e8798f90a7a8d705cea08e053c56a4575b.tar.bz2
portage-8a4d81e8798f90a7a8d705cea08e053c56a4575b.zip
Disable the test phase when USE=test is masked (for consistency with the fix for bug #69021).
svn path=/main/trunk/; revision=5646
-rwxr-xr-xbin/ebuild.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 57eca618a..0b6ac9652 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1019,6 +1019,9 @@ dyn_test() {
fi
if ! hasq test $FEATURES && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
vecho ">>> Test phase [not enabled]: ${CATEGORY}/${PF}"
+ elif ! hasq test ${USE} && [ "${EBUILD_FORCE_TEST}" != "1" ]; then
+ ewarn "Skipping make test/check since USE=test is masked."
+ vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
elif hasq test $RESTRICT; then
ewarn "Skipping make test/check due to ebuild restriction."
vecho ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"