From 6c4112a19319fbf87250a6e3601875949812e1db Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 9 May 2007 22:50:49 +0000 Subject: [PATCH] Make sure USE=test is properly enabled when the test phase is forced via the ebuild command. Thanks to Caster for reporting. (trunk r6507:6508) svn path=/main/branches/2.1.2/; revision=6509 --- bin/ebuild | 3 +++ pym/portage.py | 2 ++ 2 files changed, 5 insertions(+) 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] -- 2.26.2