| 1 |
commit: 7a683809e4f7f61590a770df7f79cfa633a18d8e |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Mar 1 06:36:29 2021 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 1 06:40:26 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7a683809 |
| 7 |
|
| 8 |
Add unit test demonstrating --autounmask-use / --binpkg-respect-use=y conflict |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/773469 |
| 11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 12 |
|
| 13 |
lib/portage/tests/resolver/test_useflags.py | 18 +++++++++++++++++- |
| 14 |
1 file changed, 17 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/lib/portage/tests/resolver/test_useflags.py b/lib/portage/tests/resolver/test_useflags.py |
| 17 |
index 0a5f3b3ff..7439dc306 100644 |
| 18 |
--- a/lib/portage/tests/resolver/test_useflags.py |
| 19 |
+++ b/lib/portage/tests/resolver/test_useflags.py |
| 20 |
@@ -10,17 +10,24 @@ class UseFlagsTestCase(TestCase): |
| 21 |
ebuilds = { |
| 22 |
"dev-libs/A-1": { "IUSE": "X", }, |
| 23 |
"dev-libs/B-1": { "IUSE": "X Y", }, |
| 24 |
+ "dev-libs/C-1": { "IUSE": "abi_x86_32", "EAPI": "7" }, |
| 25 |
+ "dev-libs/D-1": { "IUSE": "abi_x86_32", "EAPI": "7", "RDEPEND": "dev-libs/C[abi_x86_32?]" }, |
| 26 |
} |
| 27 |
|
| 28 |
installed = { |
| 29 |
"dev-libs/A-1": { "IUSE": "X", }, |
| 30 |
"dev-libs/B-1": { "IUSE": "X", }, |
| 31 |
+ "dev-libs/C-1": { "IUSE": "abi_x86_32", "USE": "abi_x86_32", "EAPI": "7" }, |
| 32 |
+ "dev-libs/D-1": { "IUSE": "abi_x86_32", "USE": "abi_x86_32", "EAPI": "7", "RDEPEND": "dev-libs/C[abi_x86_32]" }, |
| 33 |
} |
| 34 |
|
| 35 |
binpkgs = installed |
| 36 |
|
| 37 |
user_config = { |
| 38 |
- "package.use": ( "dev-libs/A X", ), |
| 39 |
+ "package.use": ( |
| 40 |
+ "dev-libs/A X", |
| 41 |
+ "dev-libs/D abi_x86_32", |
| 42 |
+ ), |
| 43 |
"use.force": ( "Y", ), |
| 44 |
} |
| 45 |
|
| 46 |
@@ -39,6 +46,15 @@ class UseFlagsTestCase(TestCase): |
| 47 |
success = True, |
| 48 |
mergelist = ["dev-libs/A-1"]), |
| 49 |
|
| 50 |
+ # Bug 773469 - Demonstrate --autounmask-use interference with --binpkg-respect-use=y |
| 51 |
+ ResolverPlaygroundTestCase( |
| 52 |
+ ["dev-libs/C", "dev-libs/D"], |
| 53 |
+ options={"--usepkg": True, "--binpkg-respect-use": "y"}, |
| 54 |
+ success=False, |
| 55 |
+ use_changes={"dev-libs/C-1": {"abi_x86_32": True}}, |
| 56 |
+ mergelist=["dev-libs/C-1", "[binary]dev-libs/D-1"], |
| 57 |
+ ), |
| 58 |
+ |
| 59 |
#--binpkg-respect-use=n: use binpkgs with different use flags |
| 60 |
ResolverPlaygroundTestCase( |
| 61 |
["dev-libs/A"], |
Archives