diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2005-12-07 00:51:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2005-12-07 00:51:28 +0000 |
| commit | 9eedbb5929dcf933d75e794c695632ea7b85e52a (patch) | |
| tree | c5ed85211fed5587cb3f82a60bd807cbddb0d458 | |
| parent | 7e875bb4410075b69b29e6279f0adefc0b2f1c3a (diff) | |
| download | portage-9eedbb5929dcf933d75e794c695632ea7b85e52a.tar.gz portage-9eedbb5929dcf933d75e794c695632ea7b85e52a.tar.bz2 portage-9eedbb5929dcf933d75e794c695632ea7b85e52a.zip | |
cleanse maketest once and for all
svn path=/main/trunk/; revision=2344
| -rwxr-xr-x | bin/ebuild.sh | 2 | ||||
| -rw-r--r-- | pym/portage.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index c22a49504..9e1dae182 100755 --- 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 3fcded694..1b3e495ea 100644 --- 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: |