Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ebuild: do not drop FEATURES=test when USE=-test #1116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ebuild: do not drop FEATURES=test when USE=-test #1116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions lib/portage/package/ebuild/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2194,18 +2194,6 @@ def setcpv(self, mycpv, use_cache=None, mydb=None):
"BASH_FUNC____in_portage_iuse%%"
] = "() { [[ $1 =~ ${PORTAGE_IUSE} ]]; }"

ebuild_force_test = not restrict_test and self.get("EBUILD_FORCE_TEST") == "1"

if "test" in explicit_iuse or iuse_implicit_match("test"):
if "test" in self.features:
if ebuild_force_test and "test" in self.usemask:
self.usemask = frozenset(x for x in self.usemask if x != "test")
if restrict_test or ("test" in self.usemask and not ebuild_force_test):
# "test" is in IUSE and USE=test is masked, so execution
# of src_test() probably is not reliable. Therefore,
# temporarily disable FEATURES=test just for this package.
self["FEATURES"] = " ".join(x for x in self.features if x != "test")

# Allow _* flags from USE_EXPAND wildcards to pass through here.
use.difference_update(
[
Expand Down
Loading