summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ebuild3
-rw-r--r--pym/portage.py2
2 files changed, 5 insertions, 0 deletions
diff --git a/bin/ebuild b/bin/ebuild
index bb38911f7..f5ecf2374 100755
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -133,6 +133,9 @@ for arg in pargs:
print "Forcing test."
tmpsettings["EBUILD_FORCE_TEST"] = "1"
tmpsettings.backupenv["EBUILD_FORCE_TEST"] = "1"
+ tmpsettings.features.append("test")
+ tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
+ tmpsettings.backup_changes("FEATURES")
if arg == "digest" and force:
discard_digests(ebuild, tmpsettings, portage.portdb)
a = portage.doebuild(ebuild, arg, portage.root, tmpsettings,
diff --git a/pym/portage.py b/pym/portage.py
index 360abe4c1..bbb27fc14 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1920,6 +1920,8 @@ class config:
# FEATURES=test should imply USE=test
if "test" in self.configlist[-1].get("FEATURES","").split():
myflags.add("test")
+ if self.get("EBUILD_FORCE_TEST") == "1":
+ self.usemask.discard("test")
usesplit = [ x for x in myflags if \
x not in self.usemask]