diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-05-09 22:49:47 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-05-09 22:49:47 +0000 |
| commit | 88a86ef3048e6664a7ed8987da4602f3714968b1 (patch) | |
| tree | 6b835413209490bda254d1bf18873cb0e6113e8c | |
| parent | 1c0e7b93c9efdff1bc3c463040708e1fc179152a (diff) | |
| download | portage-88a86ef3048e6664a7ed8987da4602f3714968b1.tar.gz portage-88a86ef3048e6664a7ed8987da4602f3714968b1.tar.bz2 portage-88a86ef3048e6664a7ed8987da4602f3714968b1.zip | |
Make sure USE=test is properly enabled when the test phase is forced via the ebuild command. Thanks to Caster for reporting.
svn path=/main/trunk/; revision=6508
| -rwxr-xr-x | bin/ebuild | 3 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/bin/ebuild b/bin/ebuild index c5f58ba82..ce70c6f34 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/__init__.py b/pym/portage/__init__.py index ac3b79bc2..c76263899 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -1987,6 +1987,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] |