Make sure FEATURES=test and USE=test are consistently enabled for all requested phase...

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

diff --git a/bin/ebuild b/bin/ebuild
index ce70c6f3435dffce3c7388f234beaef032f983d4..aafc69d3f5e7317b076420c9a725430fd2da7d79 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -126,16 +126,17 @@ def discard_digests(myebuild, mysettings, mydbapi):
        finally:
                portage._doebuild_manifest_exempt_depend -= 1
 
+tmpsettings = portage.config(clone=portage.settings)
+if "test" in pargs and "test" not in tmpsettings.features:
+       print "Forcing test."
+       tmpsettings["EBUILD_FORCE_TEST"] = "1"
+       tmpsettings.backup_changes("EBUILD_FORCE_TEST")
+       tmpsettings.features.append("test")
+       tmpsettings["FEATURES"] = " ".join(tmpsettings.features)
+       tmpsettings.backup_changes("FEATURES")
+
 for arg in pargs:
        try:
-               tmpsettings = portage.config(clone=portage.settings)
-               if arg == "test" and not "test" in tmpsettings.features:
-                       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,