cleanse maketest once and for all

svn path=/main/trunk/; revision=2344

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c22a495049a46a264bda8b12844c9c801fd1074f..9e1dae182b8ceb7fab3f6f193e9fa597668d0ad0 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -997,7 +997,7 @@ dyn_test() {
        if [ -d "${S}" ]; then
                cd "${S}"
        fi
-       if hasq maketest $RESTRICT || hasq test $RESTRICT; then
+       if hasq test $RESTRICT; then
                ewarn "Skipping make test/check due to ebuild restriction."
                echo ">>> Test phase [explicitly disabled]: ${CATEGORY}/${PF}"
        elif ! hasq test $FEATURES; then

diff --git a/pym/portage.py b/pym/portage.py
index 3fcded6945aec1956f26757a11e4630344fc288e..1b3e495ea7e49ccaab02f40a11014f0d9f3adb53 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1261,9 +1261,6 @@ class config:
                                writemsg("PORTAGE_GPG_DIR is invalid. Removing gpg from FEATURES.\n")
                                self.features.remove("gpg")
 
-               if "maketest" in self.features and "test" not in self.features:
-                       self.features.append("test")
-
                if not portage_exec.sandbox_capable and ("sandbox" in self.features or "usersandbox" in self.features):
                        writemsg(red("!!! Problem with sandbox binary. Disabling...\n\n"))
                        if "sandbox" in self.features: