From 88a86ef3048e6664a7ed8987da4602f3714968b1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 9 May 2007 22:49:47 +0000 Subject: 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 --- bin/ebuild | 3 +++ pym/portage/__init__.py | 2 ++ 2 files changed, 5 insertions(+) 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] -- cgit v1.2.3-1-g7c22